fixed minor issues
Merge branch 'master' of https://github.com/rjagerman/ANON

Conflicts:
	paper.tex