simpler
Merge branch 'develop' of https://github.com/fivethreeo/django-dragoman-blog into develop