Remove utils.six for 1.4.0 compat. Add django.conf.settings
Merge pull request #2 from cam-stitt/master

Remove utils.six for 1.4.0 compat. Add django.conf.settings