Modified: Update vimrc.
Merge branch 'master' of github.com:futoase/dotfiles

Conflicts:
	.vimrc