Fix #2 by switching to this Grunt task to a multi-task