fixes guifont
Merge branch 'master' of https://github.com/jfmercer/.dotvim
fixes merge conflicts