Merge pull request #17 from thacher/master

Updates to Database location
Move action hooks to places where the v2 cartridge can find.
Merge pull request #1 from BanzaiMan/master

Merge from v2 updates