reverts pg
comments out spring
new gemfile.lock
Merge pull request #20 from drewcp87/development

Development