update deps
Merge branch 'master' of https://github.com/gruntjs/grunt-contrib-jasmine

Conflicts:
	package.json