Merge branch 'kolais' of github.com:arrayexpress/annotare2 into kolais
Merge branch 'develop' into kolais
Merge remote-tracking branch 'origin/kolais' into kolais
Merge remote-tracking branch 'origin/kolais' into kolais
All escaping is done in Limpopo now; also renamed a method to be more descriptive about what it's doing