chore(grunt): use surround

Following #134 and #133
Auto surround the sources