* org2jekyll.el: ugly but working
Merge branch 'master' into origin-master