Cleaning up grunt file
More grunt work