some style
Merge branch 'master' of https://github.com/GordonGustafson/mchacks

Conflicts:
	templates.py
Revert "Merge branch 'master' of https://github.com/GordonGustafson/mchacks"

This reverts commit eec05ead6732ac92fa9be102a371ba960b70584e, reversing
changes made to da3dfbc2d9bd4c8b6c3d7d070043a06155848ed7.