Mass update vim bundles
Misc changes
misc updates
Merge branch 'master' of http://github.com/awwaiid/dotfiles
Clean up merging

Conflicts:
	.vim/.netrwhist
	.vim/bundle/classpath/.gitignore
	.vim/bundle/classpath/README.markdown
	.vim/bundle/classpath/autoload/classpath.vim
	.vim/bundle/classpath/doc/classpath.txt
	.vim/bundle/classpath/plugin/classpath.vim
	.vim/bundle/clojure-static/LICENSE.txt
	.vim/bundle/clojure-static/README.markdown
	.vim/bundle/clojure-static/autoload/clojurecomplete.vim
	.vim/bundle/clojure-static/clj/.gitignore
	.vim/bundle/clojure-static/clj/project.clj
	.vim/bundle/clojure-static/clj/src/vim_clojure_static/generate.clj
	.vim/bundle/clojure-static/clj/src/vim_clojure_static/test.clj
	.vim/bundle/clojure-static/clj/src/vim_clojure_static/update.clj
	.vim/bundle/clojure-static/clj/test/syntax_test.clj
	.vim/bundle/clojure-static/clj/vim/syn-id-names.vim
	.vim/bundle/clojure-static/doc/clojure.txt
	.vim/bundle/clojure-static/ftdetect/clojure.vim
	.vim/bundle/clojure-static/ftplugin/clojure.vim
	.vim/bundle/clojure-static/indent/clojure.vim
	.vim/bundle/clojure-static/syntax/clojure.vim
	.vim/bundle/fireplace/.gitignore
	.vim/bundle/fireplace/README.markdown
	.vim/bundle/fireplace/autoload/nrepl/fireplace_connection.vim
	.vim/bundle/fireplace/doc/fireplace.txt
	.vim/bundle/fireplace/plugin/fireplace.vim
	.vim/bundle/fireplace/plugin/fireplace/zip.vim
	.vim/bundle/vim-classpath/.gitignore
	.vim/bundle/vim-classpath/README.markdown
	.vim/bundle/vim-classpath/autoload/classpath.vim
	.vim/bundle/vim-classpath/doc/classpath.txt
	.vim/bundle/vim-classpath/plugin/classpath.vim
	.vim/bundle/vim-clojure-static/LICENSE.txt
	.vim/bundle/vim-clojure-static/README.markdown
	.vim/bundle/vim-clojure-static/autoload/clojurecomplete.vim
	.vim/bundle/vim-clojure-static/clj/.gitignore
	.vim/bundle/vim-clojure-static/clj/project.clj
	.vim/bundle/vim-clojure-static/clj/src/vim_clojure_static/generate.clj
	.vim/bundle/vim-clojure-static/clj/src/vim_clojure_static/test.clj
	.vim/bundle/vim-clojure-static/clj/src/vim_clojure_static/update.clj
	.vim/bundle/vim-clojure-static/clj/test/syntax_test.clj
	.vim/bundle/vim-clojure-static/clj/vim/syn-id-names.vim
	.vim/bundle/vim-clojure-static/doc/clojure.txt
	.vim/bundle/vim-clojure-static/ftdetect/clojure.vim
	.vim/bundle/vim-clojure-static/ftplugin/clojure.vim
	.vim/bundle/vim-clojure-static/indent/clojure.vim
	.vim/bundle/vim-clojure-static/syntax/clojure.vim
	.vim/bundle/vim-fireplace/.gitignore
	.vim/bundle/vim-fireplace/README.markdown
	.vim/bundle/vim-fireplace/autoload/nrepl/fireplace_connection.vim
	.vim/bundle/vim-fireplace/doc/fireplace.txt
	.vim/bundle/vim-fireplace/plugin/fireplace.vim
	.vim/bundle/vim-fireplace/plugin/fireplace/zip.vim
	.vim/disabled/ag
	.vim/disabled/vim-classpath/.gitignore
	.vim/disabled/vim-classpath/README.markdown
	.vim/disabled/vim-classpath/autoload/classpath.vim
	.vim/disabled/vim-classpath/doc/classpath.txt
	.vim/disabled/vim-classpath/plugin/classpath.vim
	.vim/disabled/vim-clojure-static/LICENSE.txt
	.vim/disabled/vim-clojure-static/README.markdown
	.vim/disabled/vim-clojure-static/autoload/clojurecomplete.vim
	.vim/disabled/vim-clojure-static/clj/.gitignore
	.vim/disabled/vim-clojure-static/clj/project.clj
	.vim/disabled/vim-clojure-static/clj/src/vim_clojure_static/generate.clj
	.vim/disabled/vim-clojure-static/clj/src/vim_clojure_static/test.clj
	.vim/disabled/vim-clojure-static/clj/src/vim_clojure_static/update.clj
	.vim/disabled/vim-clojure-static/clj/test/syntax_test.clj
	.vim/disabled/vim-clojure-static/clj/vim/syn-id-names.vim
	.vim/disabled/vim-clojure-static/doc/clojure.txt
	.vim/disabled/vim-clojure-static/ftdetect/clojure.vim
	.vim/disabled/vim-clojure-static/ftplugin/clojure.vim
	.vim/disabled/vim-clojure-static/indent/clojure.vim
	.vim/disabled/vim-clojure-static/syntax/clojure.vim
	.vim/disabled/vim-coffee-script
	.vim/disabled/vim-fireplace/.gitignore
	.vim/disabled/vim-fireplace/README.markdown
	.vim/disabled/vim-fireplace/autoload/nrepl/fireplace_connection.vim
	.vim/disabled/vim-fireplace/doc/fireplace.txt
	.vim/disabled/vim-fireplace/plugin/fireplace.vim
	.vim/disabled/vim-fireplace/plugin/fireplace/zip.vim
	.vim/disabled/vim-ruby