add vimrc setting
update gitconfig
Merge branch 'master' of github.com:skodama/dotfiles
update vimrc