User my fork of gorp since my changes on the original are not in master yet.

This reverts commit 1e9e18dcf92ff7611ae854e91345d301431f1d4a.