Django 1.6 transaction changes

@cpennington This should fix most of the transaction related errors. Some may still be present wherever `IntegrityError` is caught by the code.