Version 0.94

Fixes problem with flickr changes
0.95

fixes for flickr and error handling
Conflict fixing; merge with upstream/master
Removed the zipped extension from the root