update to bundling / minification of assets
merge