Merge branch 'release/1.0.4' into develop
use current user as the reply user
pep8 fixes
Merge branch 'develop' of github.com:praekelt/django-moderator