Deploy test

This merge incorporates the wps branche and additional changes to bower to make sure all necessary data is copies for deployment.