SW 2 -> 4
Merge branch 'master' of github.com:romainl/dotvim