Merge pull request #381 from isuftin/master

Pinning/Unpinning
postgres table definitions
Merge remote-tracking branch 'upstream/master'
Merge pull request #386 from bheck/master

Sorry Barry, screwed this up