Attempt to fix hanging salt processes by killing them when given up waiting for responses (OMS-313)
Fix leftover from debugging (OMS-313)
Merge pull request #49 from opennode/oms-313

Attempt to fix hanging salt processes by killing them when given up wait...