Merge branch 'develop' into upgrade-django
remove admin template cruft
remove staff app
update url tags to new django scheme
refactor blog urls to class-based
move more views and urls to class based