Need to re-brand licensing, code etc from FlickrJ. This must maintain the references required by FlickrJ's license agreement