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
Fix whitespace stuff that was breaking pep8; not bothering with new line length rec since pep8 isn't updated for this yet
Run Travis against most recent versions of Django
Allow chaining of QuerySet-returning methods
Merge pull request #20 from boydjj/support-QuerySet-returning-methods

Support query set returning methods
Merge from upstream/master
Add settings var for custom queryset returning methods