More General Database Fixes
Merge branch 'master' of https://github.com/matthewmilitante/pinly