Ensure that timeout is parsed as an integer from parse files
Merge password code with the bug fix for timeouts from config files
Merge pull request #71 from SLsthompson/master

Parse timeouts from config files as integers