reset settings.py
Merge branch 'master' of https://github.com/chiminey/chiminey

Conflicts:
	chiminey/settings.py