update
Merge branch 'master' of github.com:atsumo/dotfiles
update vimrc