minor extra tinkering
merged

Merge branch 'master' of https://github.com/gui2/Documents

Conflicts:
	CogSci14/ja_discovery.aux
	CogSci14/ja_discovery.log
	CogSci14/ja_discovery.pdf
	CogSci14/ja_discovery.synctex.gz
classifier revisions
cleanup