Update of various grunt tasks

Some updating and tweaking of the grunt tasks used within the project.