Fixed admin to work with Django 1.5 custom User models that don't have a username or email field
Fixed whitepsace issues
Merge branch 'custom-user-model-admin-fix' of github.com:OysterBooks/django-stripe-payments into OysterBooks-custom-user-model-admin-fix

Conflicts:
	payments/__init__.py
	payments/models.py