Make timeout configurable
Updates after review
Merge pull request #100 from Metaswitch/iss79

[Reviewer: Alex] Make timeout configurable