Update vimrc
Update
Merge branch 'master' of https://github.com/keyworks/dotfiles

Conflicts:
	.bashrc
	.vimrc