Merge Mike's postgres stuff

This does some basic style tweaking to Mike's code, and modifies the folder structure a bit to make postgres a bit easier to use.

It also bumps the Ruby version to 2.1.2, so you'll probably have to `rbenv install 2.1.2`.