New db migrations
Merge pull request #181 from CalvinFernandez/fix-migrations

New db migrations
Merge branch 'master' of https://github.com/maplesyrup/maple
final schema
Merge pull request #182 from benrudolph/new-schema

New schema
merged conflicts