Merge branch 'master' into apiv2_tags
Merge remote-tracking branch 'upstream/master' into apiv2_frontend_bugfixes

ecially if it merges an updated upstream into a topic branch.
Fixed helpful test error message
Merge branch 'master' into transform
Not that frontend issue 955 is resolved, we should use the return value of the transform API to replace the photo object's fields
Update README to stop nosetests from capturing the logging, since it gets pretty large.
Logs are saved to tests.log.
Add API versioning support, including tests
Remove unneeded LOG_FILENAME variable
Run all tests at all API versions
Handle case where tag count is returned as string (as was the case in APIv1)
next/previous fields are lists in APIv2, but single photo ids in APIv1.
Update README with API versioning documentation
Use the OAuth2 client for multipart POSTing - no need for urllib2
Check that upload parameters are processed correctly
Improve http logging, and don't log multipart upload contents
Check the HTTP response code if the OpenPhoto JSON cannot be decoded.
Merge branch 'minor_fixes' of github.com:sneakypete81/openphoto-python into minor_fixes
Improve POST logging - don't log file contents.
Revert 35a271c25bcae8aeb23bcfe48953382ac53d43fc, since this has been applied on the http_improvements branch
Comment whitespace