Revert "Merge branch 'develop' of github.com:ttacon/gorp into develop"

This doesn't work at all.

This reverts commit 15033b093a009a0507848ec0a40044dbdc4ffe08, reversing
changes made to 9506853d6b524f62754caea4d7c7cf78f60c89e9.