fix some cross platform detection.
Merge branch 'master' of https://github.com/4con/dotvim