Updates
Merge branch 'master' of https://github.com/nbfritz/vimconfig
Windows upates:
Merge branch 'master' of https://github.com/nbfritz/vimconfig