Merge branch 'master' of ssh://kevinw@repo.or.cz/srv/git/vimrc