Neglected to apply two fixes from another branches.

1) Updated binn.c and binn.h to the latest versions
2) Removed unnecessary double dereferencing from metrics.[c|h]

Author: rapier1