Changed the rest of the FlickrImage mentions to Image - this breaks galleries for now