Some clean-up work.
Merge branch 'develop' of github.com:Mudox/vim-config into develop