copied over a ton of stuff from indiepen and adapted it.
Merge branch 'master' of github.com:neuman/carteblanche-django-boilerplate

Conflicts:
	carteblanche_boilerplate/core/models.py