Thanks to the nice people at ipernity who supply a really cool tool to import from Flickr, all is now complete. Time for a tidy up!