a couple of tweaks to the hc-file-bundle target:
  - Add -r option to ${RM} to blow away an existing binary-dist
    temporary directory if present.
  - Fix bogons in the bundle building code.