minor updates
Merge branch 'master' of https://github.com/stephens999/ash

Conflicts:
	paper/main.aux
	paper/main.log
	paper/main.pdf