Update README.md
Merge branch 'master' of https://github.com/densitydesign/sven

Conflicts:
	README.md
	settings.py.SAMPLE
Merge branch 'master' of https://github.com/densitydesign/sven