Added tox as test runner
Added Django 1.5 to setup.py, tox and travis
Merge branch '1.5-support' of git://github.com/alej0varas/mock-django into alej0varas-1.5-support

Conflicts:
	.gitignore