Typos etc
New things to ignore
Merge branch 'master' of github.com:sociam/socm2013-health-social-machines

Conflicts:
	health-social-machines.pdf
	health-social-machines.tex