more cleanup
Merge branch 'master' of https://github.com/headphonesjones/Blohaute

Conflicts:
	templates/checkout.html