Minor changes
Merge branch 'master' of github.com:cyrus-/papers

Conflicts:
	sanitation-psp14/sanitation-psp14-short.aux
	sanitation-psp14/sanitation-psp14-short.log
	sanitation-psp14/sanitation-psp14-short.pdf
Fresh make