Adding dependencies, first pass at db models, config stuff
Merging changes
Resolve Gemfile.lock