Merge branch 'master' of https://github.com/e9wikner/swc_site

Conflicts:
	fabfile.py
Merge branch 'master' of https://github.com/e9wikner/swc_site

Conflicts:
	fabfile.py