minor updates
Merge branch 'master' of https://github.com/SimonAB/dotvim
'Merging updates'
Please enter a commit message to explain why this merge is necessary,