Merge pull request #29 from jrconlin/dev

retargeting PR#26 for mozsvc dev
Merge pull request #34 from jrconlin/dev

Add timeouts for router