change .vimrc and dotfilesLin.sh
Merge branch 'master' of github.com:ryo-n/dotfiles

Conflicts:
	.vimrc