Enhacements in gruntfile
Merge pull request #13 from matiu/feature/grunt-enhacements

Enhacements in gruntfile