added bower.js
syntax fix
directory path fix
Merge branch 'master' into gh-pages