Use new vim-bundler syntax & some minor tweaks