Tidy up flickr_album and jokull to be both libs and scripts