Merge branch 'master' of github.com:planset/.vim