Updates for windows version of vimrc
Adding in new windows changes and merging.
Merge branch 'master' of https://github.com/brolfe/dotfiles