Upgrading Conqueterm and gundo
Adding Clojure and Taskpaper plugins.
Merge branch 'master' of github.com:kunday/Vim-Dot-Files

Conflicts:
	.vimrc