chore(grunt): use surround

Following #134 and #133

Here is a fast implementation of what I mean.
Still we might use a real concatenation so we can test over the final result (don't know if it's really necessary...)