Merge apcupsd driver

I thought we had merged this already, but I think it was a casualty of the Git conversion.