fixed namespaces so hooks can be found
Merge branch 'master' of github.com:antler/caribou-development