removed dead code
added optional timeout, defaults to 30 seconds
[FIXED JENKINS-22014]
Merge pull request #9 from wannessels/fix-timeout

Fix timeout