Merged flickrj in

The flickr API seems to enforce https:// only API calls now. 
To combat this, I've merged the flickrj code in and changed the URL scheme. It seems to have been left to rot so I figured this is easiest.