Typo fixes
Merge branch 'master' of https://github.com/sociam/socm2014-observing-social-machines

Conflicts:
	socm2014-observing.tex