just kidding about pg
Merge pull request #74 from shackbarth/bugfix

just kidding about pg
Merge pull request #20 from xtuple/master

catching up