Merge branch 'swaggerui-1.2'
jslint
move hapi-swagger over to using models instead of flat params.
add Makefile so "npm test" will run the mocha scripts
look in the correct place for the response schema
add model support for Joi < 2.0
force payload model to be required if present
Merge branch 'master' of https://github.com/glennjones/hapi-swagger
Merge branch 'master' into feature-models

Conflicts:
	lib/index.js
don't send undefined through in enums (as it gets converted to null by JSON.stringify), do send through null if present in valids array
Merge pull request #19 from HughePaul/feature-models

Feature models