Merge branch 'master' of github.com:reverb/swagger-spec

Conflicts:
	examples/mads/petstore-expanded.json
	examples/wordnik/petstore.json