reformat

reformat
Merge branch 'master' of ssh://github/mk270/ocaml-prolog
Merge branch 'master' into convert-to-lib