Spring cleanup
options are now called availableOptions
Merge pull request #315 from twokul/cli-cleanup

Spring cleanup
consistency
partially bring the CLI interface back up to parity with master
Fixes acceptance tests
Merge pull request #318 from twokul/init-slow-tests

Fixes acceptance tests