adding a few new tricks to the gruntfile
fixing merge conflicts