Changes to be committed:
	modified:   vimrc
Merge branch 'desktop' of github.com:brotatos/dotfiles into desktop