Add bundles and modified hammer.vimrc