flickr: some attributes changes

Also revert Total to an "int string", the doc was a lie and Aaron was
right.

Change-Id: I81ca7c8a3e3141beed1c4a3e5784a590a11f1399
Merge "flickr: some attributes changes"
picasa: clean up album attributes, add tests, fix keywords with spaces

Change-Id: I32faae16334e3999731f3980502eb6a1a6d38595