Fixed some of the grunt dependencies
merged