Fix npm/bower/grunt dependency hierarchy.

Grunt depends on Bower, so I just merged the Bower stuff into the Grunt settings and added it as a dep.