Various fixes for setup.sh

 * Was failing in a new environment
 * Added in lines to copy over 'test' config files into production
 * Added in lines to copy existing production config files when redeploying