Hotfixes on the server!? Yipes!
Merge branch 'master' of https://github.com/stett/tall_rhino

Conflicts:
	blog/views.py