Fixes #8
incorporating code review changes
Merge pull request #9 from yahoo/uniform_config

Fixes #8 - deprecated name for incoming timeout value