Rewritten image handling on dev

[chrisgoringe]

I've just merged into dev a complete rewrite of the way images are handled. The code for that was a mess from the series of different changes, the new version should be much more efficient.

As always with such things, I may have missed some cases, so please feel free to raise issues for anything you find broken, or mention them here.