Fix merge conflicts from origin.

Conflicts:
	vim/bundle/vim-clojure-static
	vim/bundle/vundle/spell/en.utf-8.add.spl
	vim/vimrc