Do not explicitly force non-standard timeouts
Do not explicitly force non-standard timeouts

This should specifically not set timeouts that have been changed.

I also ran the code through autopep8 for good measure.

TouqeerHussain/ops,WrathOfChris/ops,WrathOfChris/ops,TouqeerHussain/ops