vimrc
Merge branch 'master' of github.com:cona/etc