Cleaning up some of the syntax
Taken from the petstore v2 demo

Cleaned up syntax and made collections plural.
Including the new petstore samples
Merge pull request #248 from earth2marsh/master

Cleaning up the YAML examples