Merge of https://bitbucket.org/ColeVsCode/django-registration/ & https://bitbucket.org/ubernostrum/django-registration