Fixed #112 -- Added Django 1.6 support

Reorganised packages a bit. Tests are failing - 157/628 of them. I suspect it is from the changes with regard to transaction management. Most of the tests that fail are failing with an IntegrityError of some sort. Will figure out what's going on and rebase the pull request.