lots of tweaks to gulpfile and better integration with bower