Quick vimrc editing
Merge branch 'master' of https://github.com/osandov/dotfiles

Conflicts:
	vimrc
Merged vimrc