Use abspath if relpath fails (windows bug fix)

If I'm syncing a directory of d:\something and my cwd is c:\something
then os.path.relpath complains that it can't work out a relative path.
When this happens, we just use the abspath instead.
Merge branch 'no-relpath' into develop

* no-relpath:
  Use abspath if relpath fails (windows bug fix)
Fix typo in docstring of relative_path
Use -r with less for help output

On some platforms, such as Fedora, groff by default outputs control
characters which less will display escaped by default (on other
platforms such as Debian and OSX this is disabled via local
customisations and falls back to the old method of backspacing over
characters).

Using less -R as the pager means that output looks correct in both
cases.
Merge branch 'ianw-help-ascii' into develop

* ianw-help-ascii:
  Use -r with less for help output
Use dev version of jmespath in requirements.txt

Fixes test failures.
Include argparse in py26 bundled install

Also removed dead code and used a unique venv
directory to create the bundled install each time.
This makes it possible to run scripts/make-bundle
multiple times.
Fix install script bug for error conditions

When an error occurs, stderr was None because of
stderr=subprocess.STDOUT.  Now we just use subprocess.PIPE
so we can only include stderr in the error case.
Actually zip the bundled dir

As the function say it's suppose to do :)
Merge branch 'py26-bundle-install' into develop

* py26-bundle-install:
  Actually zip the bundled dir
  Fix install script bug for error conditions
  Include argparse in py26 bundled install
Bump botocore dependency to 0.19.0
Bumping version number to 1.1.2
Merge branch 'release-1.1.2' into develop

* release-1.1.2:
  Bumping version number to 1.1.2
Update ec2 test to use proper xmlns

Fixes test failure.
Updating requests to 2.0.0.  Depends on https://github.com/boto/botocore/pull/151