Expires + #82

Fix non-standard uid and expires. And this library was creating a timestamp for expires where the spec clearly states (seconds)expires_in should be used and this has been corrected.

This is an important commit as this library was not in compliance with the OAuth2 standard when returning expires(_in)  

This PR is a combination of #82 and this new commit.