Clean up bis
Merge branch 'master' of https://github.com/pcouderc/ace-ocaml