Merge branch 'develop' of github.com:amdt/vim-niji into develop