changed component.json to bower.json to avoid future conflicts
Merge branch 'master' of https://github.com/dannypage/Dashboard

* 'master' of https://github.com/dannypage/Dashboard:
  Incremental changes to the models
  Relationship Building and Schema
  Generated everything
Merge branch 'master' of https://github.com/dannypage/Dashboard

* 'master' of https://github.com/dannypage/Dashboard:
  Starting to Personalize Feeds via options
  Sample Twitter data working
  Changed the ID, set up relationships
various structural additions/tweaks -- lame, I know.
Merge branch 'master' of https://github.com/dannypage/Dashboard

* 'master' of https://github.com/dannypage/Dashboard:
  Widget Adjustment