Minor updates
Merge branch 'master' of https://github.com/SimonAB/dotvim
Merging with Linux