Ensure correct version of should to fix cast test
Including jshint in the project
Merge branch 'master' of github.com:clocklimited/Catfish
Merge branch 'master' of github.com:clocklimited/Catfish

Conflicts:
	package.json
Merge branch 'master' of github.com:clocklimited/Catfish