proposed fix for issue https://github.com/sensu/sensu/issues/736
Merge pull request #739 from grahaminn/patch-sub-command-tokens

proposed fix for issue https://github.com/sensu/sensu/issues/736