Updates to grunt file
Some changes
Fixed merge conflict