Fix timeboxing and clean up old session code
Merge pull request #36 from ntsp/timebox

Fix timeboxing and clean up old session code.