Separate gvimrc and vimrc setting.
Merge branch 'master' of github.com:TEVASAKI/dotfiles

Conflicts:
	TERATERM.INI

merge