Fixes #85  - Added BPL Flickr provider and refactored Flickr code