fix ping
Merge branch 'master' of github.com:JustinAzoff/apitest

Conflicts:
	ssh_runner.py
Merge branch 'master' of github.com:JustinAzoff/apitest