Move variables out of setup-2 and into config
Merge branch 'ubuntu_deploy' of github.com:foxdog-studios/citysdk into ubuntu_deploy

Conflicts:
	config/config.template.sh