fontcatalog removed from version control
Merge branch 'master' of https://github.com/aantonello/vim-config

Merging changes made on Windows version.