Improve Django 1.5 support and applied several pep8 updates
Make several tests pass. Some still need some more work
Fix some more tests.