Settings pulls from a local_settings.py file now
Merge branch 'master' of github.com:jsayles/kfiles
format changes