grunt-cli should not be deps of devDependencies apparently
Merge branch 'master' into staging.glsl.io