Log Message:
Updated package to work with new mk/ocaml.mk, and straightened out some
of the github variables. No upstream changes.