Fix all the errors!
Merge branch 'master' into acclaim

Conflicts:
	source/conf.py