Defaults everyone can agree on
Merge branch 'master' of git://github.com/whiteley/vim-addon-whiteley
fix os detection