Removed redundant code
Added increased timeout for Salt
Merge branch 'master' of github.com:mclarkson/obdi