Added tox

https://testrun.org/tox/latest/
Fixed failing migrations

Migrations where fixed so they use the correct user model depending on
the running environment
Merge branch 'south-1' into softdelete

Conflicts:
	requirements.txt
	setup.py