Fixed session expiration time and removed some outdated FIXME comments
Merge pull request #6 from davewhittaker/master

Just a bit of cleanup