removed unnecessary models and changed schema, need to drop create and migrate again from here
removed redundant migrations
fixed merge errors
Merge branch 'develop' of github.com:crywolfe/buggy-bus-app into develop