Updated from upstream
Merge branch 'master' of github.com:madssj/dotvim