Fixes to work under newer version of ImageMagick: 
- Compare output changed.
- Diff file generation only works without -metric AE flag, so generate
it separately after comparison is done.