Improving testing using tox

There are broken tests, but it is easier to run the tests via tox now, including with Django 1.7

I'd be happy to create a travis config as well, if that would be helpful?