Merged flickrj in

Merged flickr code in. It seems to have been left to rot and a http://
needed to change to https:// to keep working against flickr