refactor token creation
Merge remote-tracking branch 'upstream/master'
rename tokenLifespan to accessTokenLifespan
Merge pull request #233 from patriot1burke/master

refactor token creation