scope mapping, oauth client
Merge remote-tracking branch 'upstream/master'
fix testsuite dependency
Merge pull request #58 from patriot1burke/master

scope mapping, oauth client