Tidy up master and add bower support