updated generally and for 1.7
Merge branch 'master' of https://github.com/ddenhartog/django-simple-account
Updated for Django 1.7