Merge pull request #273 from garyburd/issue-268

Run VCS commands with a timeout