Update models, add new routes, and update tests
Merge pull request #13 from jasondbaker/dev-jdb-04182014-2

Update models, add new routes, and update tests