make license a short string
remove "Software" form license string
Make argparse a dependency only in Python 2.6.x.
Added an additional column in table describing variables that shows CLI option, if any.
Relax help output test.

The rendering might insert multiple spaces so we're using
a regex to verify this test instead of an exact match.
Merge branch 'fix-doc-test' into develop

* fix-doc-test:
  Relax help output test.
Merge branch 'develop' of git://github.com/coryb/aws-cli into coryb-develop
Merge branch 'fix-issue-307' of git://github.com/garnaat/aws-cli into garnaat-fix-issue-307
Merge remote-tracking branch 'upstream/develop' into develop
Added new s3api samples from Peter Moon