Fixed merge conflict.

Conflicts:
	devblog/blog/admin.py
	devblog/blog/models.py
	devblog/blog/tests.py
	devblog/blog/views.py
	devblog/devblog/_keys.py
	devblog/devblog/settings.py
	devblog/devblog/urls.py
	devblog/devblog/wsgi.py
	devblog/manage.py
Merge branch 'rework' of github.com:patrickdoane/devblog into rework