Various tweaks to config + misc updates
Merge branch 'master' of github.com:pilf/vim-files