arrange plugins
Merge branch 'master' of github.com:kashewnuts/dotfiles

Conflicts:
	files/.gvimrc
fixed