update to use new bower_components dir
Merge remote-tracking branch 'upstream/master'

* upstream/master:
  update to use new bower_components dir