Support for Windows
Merge branch 'master' of https://github.com/baderj/vimrc