Add pelican-flickr plugin.
Added pelican-flickr, fixed conflict in gitmodules
Merge branch 'La0-pelican-flickr'
Merge branch 'master' of github.com:getpelican/pelican-plugins