fixes
Merge branch 'master' of https://github.com/aaronzirbes/vim-files