Inactivity timeout support
Some test for inactivity timeout

They're far from ideal - slow, and occasionally the timers set up by the
tests don't fire, leading to failures. Suggestions for improvements
welcome
Update readme for inactivity checks
Commented out puts statements in tests
Merge branch 'inactivity_checks'

Conflicts:
	README.md