Refactored token access into separate methods
Detecting environment variables, forcing expiration if set
Merge pull request #1999 from christav/force-expiration

Force token expiration