added shortcuts for cli options
removed cli options which don't work properly
Merge pull request #110 from alphagov/shortcuts_for_cli

added shortcuts for cli options