Update vimrc for Windows
Merge branch 'master' of git://github.com/fjellyman/dotvim