Move hooks to the places v2 cartridge expects
Merge pull request #1 from BanzaiMan/master

v2 migration code