Added tox testrunner
Merge remote-tracking branch 'eculver/master'

Conflicts:
	.travis.yml
	requirements.txt
Django 1.5 compatibility
Travis / Tox adjustment
Added manage.py for testing purposes
Travis update