Merge pull request #31 from kevmoo/master

cleanup and compat w/ latest SDK
eliminated need for top-level token field in OAuth2

clients should use other methods
field naming
removed unneeded call to super
BREAKING: some renaming
move private methods to end of class
more cleanup
cleanup to proxy callback