Merge pull request #372 from pgreyson/master

iperf changes. add "K" action to kill a controller without wait state displaying