ignoring settings.py - dev
fixing gitignore typo - dev
rm cached settings.py
update gitignore
Merge branch 'dev'

Conflicts:
	.gitignore