Cleanup whitespace
Change default timeout from 60 seconds to 300 seconds to help with longer upgrades. This closes #131.
Merge pull request #157 from jwilberding/timeout

Timeout