roll up the db changes etc
Merge pull request #59 from pickle27/rollup

Rollup