Merge pull request #5 from jmcintyre/master

Add commands to configure various upstream timeouts.
add new timout config
Update README.md
make test working on windows