Import timeout(1) from base r268861
Update .gitignore