Merge, _vimrc and .vimrc
Merge branch 'master' of github.com:maijou2501/dotfiles