Add additional options to the CLI.
Merge pull request #66 from opscode/tc/add-additional-options

Add additional options to the CLI.