Using 4-space indentation
Merge branch 'master' into 4-spaces

Conflicts:
	dustinfarris/settings/settings.py
	fabfile.py