Reorganize .vimrc
Merge branch 'master' of https://github.com/canonw/dotvim