Updated server configs
Updated server IPs in fabfile
Merge branch 'update-configs' into staging

Conflicts:
	fabfile.py