with heroku-specific stuff now
Merge branch 'master' of https://github.com/jay-tyler/django_users