Merge pull request #111 from spring-peepers-2014/restructure-models

Restructure models
Merge pull request #112 from spring-peepers-2014/restructure-models

Add new activerecord models