Apologies for the long delay in looking at this!


This seems OK to me, I've made a few updates to the package definition,
and removed some redudant bits and pushed it to master as
bb67d7d99decd416b0235593913d23aeaddce734.

Thanks,

Chris