Bump the test timeouts on TimerTest up to 5 secs to see if that rids us of the odd test failure.
Merge pull request #336 from seanparsons/future-test-timeout-bump

Cranked the test timeouts on TimerTest up to 5 seconds.