Fix cleaning intermediate images
Fix cleaning intermediate images

* Don't delete build images
* Work when `---> <image_id>` and `Removing intermediate container`
  lines are out of order.

delfick/harpoon,realestate-com-au/harpoon,realestate-com-au/harpoon,delfick/harpoon