Minor doc update
Move production servers to master branch
Merge branch 'hotfix/prodenvs_to_master'
Merge tag 'prodenvs_to_master' into develop

Ready for prod

Conflicts:
	fabfile.py