Merge branch 'release-0.11.0' into develop

* release-0.11.0:
  Bumping version to 0.11.0
Readd user-agent back to aws-cli

When I refactored out a main() function, I did not readd
the logic to override the user_agent_name when a session is
created.  This was causing the user agent (and the --version)
to be incorrect.
Run setup.py develop before running tests

So that subprocesses can import awscli properly.  Fixes
a test break in the previous checkin.
Fix py3 test failure in test_version

str vs. bytes again.
Reword docs of shorthand syntax

* Remove "As alternative to JSON" clause
* Use the param types instead of value1, value2.  This is confusing
  when a key name is "value".
Fix test failure when run on windows

Explicitly specifying "python" to run the test.
We're really just checking the output of version in as high
a level as possible (outside of code/objects) to make sure
we don't regress on this again.
Update search path processing to work on windows

We have to use os.path.abspath because this will capture the
current drive we're on.  Otherwise if our cwd is on a different
drive, we'll build our search path based on the current drive.

I've also switched the path separator to os.pathsep.

See (aws/aws-cli#101) for more details.
Merge branch 'windows-path-fix' into develop

Fixes #101.

* windows-path-fix:
  Update search path processing to work on windows
Corrected the names of several config file entries.
Python 3 fix for test

reload is no longer a builtin in py3.
lstrip values before checking for json values

Fixes #136.
Merge pull request #137 from jamesls/issue-136

lstrip values before checking for json values
Pin botocore/bcdoc version to match minor versions
Bumping version to 0.12.0
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