modified:   .vimrc
Merge branch 'master' of github.com:hamukazu/dotfiles
conflict of .vimrc fixed