vimrc
Merge branch 'github'