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