Merge branch 'master' of https://github.com/GeoMakers/geomakers
Use settings.py
Merge branch 'master' of https://github.com/GeoMakers/geomakers
Merge pull request #44 from tlpinney/master

fix settings name