Add gradle.vim to setup-vim-bundles.
Fix merge conflicts.