Merge branch 'master' of git://github.com/fehguy/swagger-spec into fehguy-master