Made Flickr uploader work with flickrapi V2.

It still works with V1.x, which is all that's currently available from
PyPI.
I've had to make some changes to flickrapi which I hope will be accepted
into the main branch, You can find the changes at
https://bitbucket.org/jim_easterbrook/flickrapi