Use vim leader key
hook_block_* and making D7 changes to hook_install and hook_uninstall
Merge conflicts