Updated bower and package.json, misc cleanup
Merge pull request #2 from bchu/master

Updated bower and package.json, misc cleanup