Updates devDependencies
Merge branch 'master' of https://github.com/oliverh855/rose

Conflicts:
	package.json