WaitForActivity honours timeout even if no activities exist.
Merge pull request #56 from shazam/wait_for_activity_timeout

WaitForActivity honours timeout even if no activities exist.