Merge branch 'release-0.13.1' into develop

* release-0.13.1:
  Bumping version to 0.13.1
Match the style of input JSON to the style used in output.  Fixes awscli issue 187.
Merge remote-tracking branch 'upstream/develop' into match-input-output
Merge pull request #83 from garnaat/match-input-output

Match input output
Retry specific 5xx http status codes
Adding model for cloudfront as well as some unit tests.
Add starting_token and max_items to paginators

When calling .paginate() on an operation you can specify two
additional parameters:

* starting_token - Indicates where to start in the pagination
* max_items - Indicates the total number of results to return.
  The results are based on the primary result key (the first item
  if there are more than one result key).
Fix ListMultipartUploads operation in s3 model to include CommonPrefixes and Prefix elements in output.  Add tests for normal response and response with CommonPrefixes.  Modify test generator slightly to allow multiple XML response files for a given operation.  Fixes #85.
Fixing space/tab issue.
Fix pep8 issues

As per review feedback.
Merge branch 'unify-page' into develop

Closes #88.

* unify-page:
  Fix pep8 issues
  Add starting_token and max_items to paginators
Allow operations to be renamed with a regex

There's a tradeoff to be made with how general this mechanism
should be vs. what we need now.  What I think is a reasonable
middle ground is:

* Define a new top level 'transformations' key
* Each transformation is keyed by a type, which can be
  anything.

So I added an 'operation-name' transformation that right now just
supports removing part of the name via a regex.  This is because
we only need this specific functionality for now, but it has
potential to grow as needed.  For example::

  {"operation-name": {"replace": ["OriginalText", "ReplacedText"]}
  {"operation-name": {"add": "Suffix"}}

You could also have a new transformation type like:

  {"docs": {"remove-tags": ["examples", "CDATA"]}}
Fix py3 test
Fix py3 test (for real this time)
Merge branch 'add_cloudfront' of git://github.com/garnaat/botocore into garnaat-add_cloudfront
Slight change to mechanism used to specify multiple tests for a single operation in response parsing tests.  Use #n suffix rather than _n.
Merge branch 'translate-updates' of git://github.com/jamesls/botocore into jamesls-translate-updates
Fix typo.
Use new rename feature in translate.py to rename operations in cloudfront to elimiate the 2013_05_12 suffix.  Changed all response parsing tests and the cloudfront operations unit test accordingly.
Fix paginator config bugs

This also adds validation in the translate module to verify
that we're using known paginator keys.  The specific fixes were:

* Use more_key instead of more_results.  Different services were using
  different keys.  They all now use more_key.
* s3 had an "output_tokens" that was suppose to be "output_token".  This
  is now fixed, and the translate module will catch and throw an
  exception when this happens.