Upgraded a bunch of dependencies so we could hit Django 1.6. Seems to work.
Conflict fix