Refactor Gruntfile to keep targets separate, integration task not quite there yet (match)