Fix build under OPAM; make binary packaging easier

Hi,

I needed to make 2 small tweaks to add this package to OPAM and create an RPM. Let me know what you think!

Dave