re-attempting oauth again.. gosh.
Include first attempt at oauth.
Merge branch 'master' into HEAD