Accounting for modules deprecated in Django 1.6, trying to be backwards compatible wherever possible.
Merge pull request #1 from WhiskeyMedia/django16

Accounting for modules deprecated in Django 1.6