Move server config to base deploy config
Merge branch 'master' into alpha