Initial work on Django 1.6
Explicitly specify Django 1.6
First pass at cleaning up transaction usage