Remove dict comprehensions (for Python 2.6)
Add tests for Django 1.4 and Django 1.5 to tox
Add Django 1.4 and Django 1.5 tests to Travis
Merge pull request #3 from treyhunner/tox-and-travis-fixes

Tox and Travis configuration improvements