add vim stuff
Merge branch 'master' of github.com:jonyamo/dotfiles

Conflicts:
	vim/vimrc