windows is different enough to warrant a separate file
Merge remote-tracking branch 'origin/master'
touching up windows vimrc