Merge pull request #23 from GarfieldLinux/master

Newhire Staging All In One   Done
format server.json and rename fresh deploy machine name
make staging be upgrade deploy
add db config to staging
Merge remote-tracking branch 'upstream/master'

Conflicts:
	config/recipes/swift_setup.rb