cleanup and fix bower
parameterized
Merge branch 'master' into gh-pages

* master:
  parameterized
  cleanup and fix bower