Merge pull request #5 from mavier/develop

Develop
Merge branch 'master' of github.com:mavier/vimfiles into develop