Rolling back some schema changes
Merge branch 'master' of github.com:conwaychriscosmo/Generosity