Merge branch 'hotfix-0.9.3'
Merge branch 'release-0.10.0'
Fixing problem with setup.py and bumping version number.
Merge branch 'release-0.10.1'
Merge branch 'release-0.11.0'

The merge conflict was because 26f601d was commited to master
but not merged back down into develop so cherry-picking that
commit and then subsequently merging back into master caused
a merge conflict (small conflict, just over the version number).

* release-0.11.0: (25 commits)
  Bumping version to 0.11.0
  Fixing problem with setup.py and bumping version number.
  Add shorthand for list of struct of scalars
  Add blank line in docs to avoid warning
  create examples directory structure and add current examples
  Install package_data.
  Remove references to rstgen and rstgen.cmd in setup.py.
  Fix help bug in python3
  Rename test to test_helper
  Cleanup error message when specifying invalid choice
  Remove erroneous paragraph in Complex Parameter Input section.
  Honor the PAGER and MANPAGER environment variables, if present.  Fixes #121.
  Remove command wrappers around rstgen.py. No longer needed now that it is done in-process.
  Update README.rst
  Add error messages on param processing errors
  Add help text for shorthand param syntax
  Update unit tests with shorthand arg syntax tests
  Add hook for supplementing example docs
  Generate rst help in awscli process
  Change file prefix from file: to file://
  ...

Conflicts:
	awscli/__init__.py
Merge branch 'release-0.12.0'

* release-0.12.0:
  Bumping version to 0.12.0
  Pin botocore/bcdoc version to match minor versions
  lstrip values before checking for json values
  Python 3 fix for test
  Corrected the names of several config file entries.
  Update search path processing to work on windows
  Fix test failure when run on windows
  Reword docs of shorthand syntax
  Fix py3 test failure in test_version
  Run setup.py develop before running tests
  Readd user-agent back to aws-cli
Merge branch 'release-0.13.0'

* release-0.13.0: (94 commits)
  Bumping version to 0.13.0
  Fix so 'make man' actually works again.  It will produce a single, consolidated man file for each service.  This approach is easier to manage than a man page for each operation.  Static man pages can be a requirement for some Linux distro packaging.
  Add proper escape transforms when on windows
  Escape double quotes on windows
  Make doc checking test less strict
  Update s3 test with latest payload botocore refactor
  Fix up some unit tests to work with the new Payload objects in botocore.
  Update integ test
  We lost support for --profile somewhere along the way.  Adding it back in along with simple test.
  Log the request id to the debug log when we don't include it in output.
  If the response body is empty, don't print the empty string for the user.
  Remove request ID from responses that do not contain any errors.
  A WIP commit, working on removing request id from the output for successful operations.  This is not ready to merge, tests failing right and left.
  Add customization to remove deprecated commands
  Change event name of top command table
  Update integration test to check for Amazon EC2
  Fix streaming output arg customization
  Unify boolean params
  Updated json file example as well
  Update docs with correct authorize-security-group-ingress call
  ...
Merge branch 'release-0.13.1'

* release-0.13.1:
  Bumping version to 0.13.1
  Change botocore/bcdoc dependencies
Merge branch 'release-0.13.2'

* release-0.13.2:
  Bumping version to 0.13.2
  Add customizations to package list
Adding simple, scalar parameters for authorize/revoke operations that mimic the legacy CLI.
Merge remote-tracking branch 'origin/develop' into ec2-add-port
Adding an additional event that gets fired when all of the options for an operation have been parsed.  Added handler for this event that provides an error message to user if they mix the --ip-permissions option with any of the scalar options.  Also added a doc event handler to tell the user to use --ip-permissions if they want to specify multiple rules in one command.
Add back support for --endpoint-url option.  Fixes #209.
Adding customizations for ec2 bundle-instance to allow users to enter scalar params and to generate a polciy if not provided and to sign the policy.
Simplifying the parameter objects.  Fixing some doc strings.
Update integration test with latest botocore changes

List param now must be a list.  This only matters when
specifying inner list elements in JSON.
Complain when file/http param resource does not exist

If a user provides an arg via file://, http://, https://
and that resource does not exist, we should immediately stop
and let them know they're specifying a resource that does not
exist.  Otherwise the user will generally get an error message
further downstream that makes it harder to troubleshoot.  Since
most of these file params are used for complex types, this generally
happens in the json parsing and/or the arg shorthand processing.
Fix py3 test bug

Still not sure why httpretty didn't like the previous version,
but this would intermittently fail on py3 (maybe 20% of the time).

Doing it this way, I'm not able to get the tests to fail after
running them repeatedly.
Merge branch 'error-file' into develop

* error-file:
  Fix py3 test bug
  Complain when file/http param resource does not exist
Bumping version number.