Merge pull request #1 from snarfed/master

use json_import in oauth2.py
Merge pull request #2 from snarfed/master

add media.users_in_photo support
Merge remote-tracking branch 'upstream/master'