minor tweaks
Merge branch 'master' of https://github.com/20MileInteractive/puritan

Conflicts:
	includes/_chino.html