Remove dependency to ocamlfind
Updated README file
Fix git conflict