Fix Grunt task discarding existing environment variables

Fixes #136, #160.
Merge branch 'master' into geezer