Fix TOKEN_TIMEOUT constant.
Carry through changes.
Merge pull request #382 from adam-vessey/7.x-constants

Update constants to fit new coding standards from coder.