Merge branch 'master' of http://github.com/interedition/collatex
Merge https://github.com/obdurodon/collatex
Fix to support json IO