There was a reference to rstgen in the docs.  That whole paragraph can be removed since all you need to do is 'make html' or 'make man'.
Add integ tests to verify empty file uploads

Didn't require any code changes, the tests are already
passing.  I'd still like to keep them in as I think it's
good that we verify that this works.
Remove group-id from the list of incompatible fields in validation.  Fixes #435.
Fix a bug in the route53 customization that was causing parsing errors on JSON bodies.
Merge branches 'garnaat-fix-435' and 'develop' into develop
Merge branch 'fix-docs-readme' of git://github.com/garnaat/aws-cli into garnaat-fix-docs-readme
Merge branch 'fix-route53-customization' of git://github.com/garnaat/aws-cli into garnaat-fix-route53-customization
Fix typo in command example
Merge branch 'empty-file-upload' into develop

* empty-file-upload:
  Add integ tests to verify empty file uploads
Merge branch 'n3104-develop' into develop

* n3104-develop:
  Fix typo in command example
Further changes for Autoscaling examples.
Bumping version to 1.2.1
Merge branch 'release-1.2.1' into develop

* release-1.2.1:
  Bumping version to 1.2.1
list_files() should yield in alphabetical order

Fixes #440.

The issue was that we were not yielding files in the same order that
S3 was yielding files.  This occurred whenever a directory was
a prefix of a file, for example, S3 would list objects in this order:

    test-123.txt
    test/test-0.txt
    test123.txt

Whereas we were listing local directory contents depth first:

    test/test-0.txt
    test-123.txt
    test123.txt

Because the syncing algorithm relies on the fact that both local
and S3 ordering is the same, this would result in unnecessary
syncing of files.  Conceptually, we'd see an S3 -> local sync
do this:

    S3   :  5 1 2 3 4 6 7
    local:  1 2 3 4 5 6 7

So when we compare S3-5 to local-1, we decide to delete local-1,
then local-2, up to local-5.  However, when we get to S3-1 and
local-6, we decide we need to add local-1 to local-5.  The end
result is that we have a set of tasks to delete files, followed
by a set of tasks to readd the files back.

The fix here was to ensure that we are listing local files by
including an `os.path.sep` for any sub directory before sorting
the contents.  Then we just recurse whenever we hit a sub directory.
Add a test for listing local contents with unicode chars
Fixed a bug in text formatting when an empty list is encountered.
Merge branch 'fix-delete-sync' into develop

* fix-delete-sync:
  Add a test for listing local contents with unicode chars
  list_files() should yield in alphabetical order
Add unit/integ test for #442

This is a test for #442, verifying we get the proper output
whenever we have a paginated response combined with text output.
Merge branch 'test-issue-442' into develop

* test-issue-442:
  Add unit/integ test for #442
Add test for #446