Various changes, see detailed description

Implemented 2 new metric methods, modified the output of the filters to
make sure the images are between 0 and 1, added the metric function to
the master