Updated grunt tasks, include templates