adding fix for issue #2 where user needs ability to specify timeout value... also moved some variable defaults to the appropriate files instead of in __main__