Pullreq tansaku command line

As received, all features green, 4 specs red

My one contribution: Knackered test restored and passing, commit 6476904

Fix for run_with_timeout is in another branch so this stays minimal, submitting in separate pull req