changed database.yml.default back to values used in the VM - reverts 5138632f95 [ci skip]
bumping a lot of gems due to security vulnaribilities in action pack, rails, and active record
Merge remote-tracking branch 'origin/master' into develop