Updated bower and package.json, misc cleanup