Revered files back to rogers previous checkin
Moving stuff around so globals etc are in config-server and wrapping common files with window/global