More re-ordering.
Merge branch 'master' of github.com:dkinzer/.vim
Merge branch 'master' of github.com:dkinzer/.vim