Migrate to django 1.6 settings default
Restore kadi customizations for django16 template
Change time zone from UTC to New York and remove TZ handling
Merge pull request #28 from sot/django16

Migrate settings for Django 1.6