delete .bundle and neobundle.vim.git
Merge branch 'master' of https://github.com/ingking/dotfiles