add pelican
Merge branch 'master' of github.com:Rykka/riv.vim
Merge branch 'master' into develop