merge package.json move bower and grunt stuff

+ better build process