Add "sqlite_file" to settings for tox/travis
Merge branch 'sqlite-filedb-support-in-tests' into integration

Conflicts:
	tox.ini
Update Django versions for tox/travis