Use transaction.atomic when available.
Updated travis.yml to use tox.
Merge pull request #201 from apollo13/atomic

Use Django's atomic when available.