Updated to version submitted to sheridan
Changes as per Sheridan's request
Merge branch 'master' of github.com:sociam/social-machines-classification

Conflicts:
	latex/paper_new.tex
Merge of papers to final version with edits sent to Sheridan