clean ups & bower

This commit contains 3 clean up commits, 

9b967e6
e836160
b3991d7

And contains 1 commit to remove committed deps

cf2c270

it is also rebased off of master so we can fast forward minor to be in the correct spot