Pull in Bernard's changes and add bower file