rm plugin
update
update
vimrc
Merge branch 'master' of github.com:nowherekai/klc-vim

Conflicts:
	bundle/potion.vim/syntax/potion.vim
	myvimrc
Merge branch 'master' of github.com:nowherekai/klc-vim