Test Django 1.7 by default
Fix Django 1.7 testing
Merge branch 'master' into dev

Conflicts:
	setup.py
Allow Django 1.7 as installed base