tweak cli steps to cleanup, grabbed a few bits from aruba and removed gem dep
fix step matching
Merge pull request #328 from ali-graham/327_fix_aruba_failure_behaviour

Fix aruba failure behaviour