Merged #222 "Add a blink comparator and pixel difference to image diffs"