Merge pull request #598 from bradrydzewski/master

minor session refactoring in prep for upcoming changes discussed in #590
added token to post-commit hooks