install osm script
Merge branch 'ubuntu_deploy' of github.com:foxdog-studios/citysdk into ubuntu_deploy

Conflicts:
	scripts/setup-production/setup-2.sh
Merge branch 'ubuntu_deploy' of github.com:foxdog-studios/citysdk into ubuntu_deploy

Conflicts:
	scripts/deploy.sh
Ensure the db user is setup
Merge branch 'ubuntu_deploy' of github.com:foxdog-studios/citysdk into ubuntu_deploy
Script sets admin password

This is a hard coded password at the moment, will need to be changed to be
loaded from a config.
Merge branch 'ubuntu_deploy' of github.com:foxdog-studios/citysdk into ubuntu_deploy
Added missing require for i18n
Install cms gems in setup
Corrected README
admin password as variable
Updated readme to be clearer on staging deployment testing instructions
Merge branch 'ubuntu_deploy' of github.com:foxdog-studios/citysdk into ubuntu_deploy
Boilerplate for central config
Merge branch 'ubuntu_deploy' of github.com:foxdog-studios/citysdk into ubuntu_deploy
Fixed README
Merge branch 'ubuntu_deploy' of github.com:foxdog-studios/citysdk into ubuntu_deploy
Moved config from setup-1.sh to config.sh
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