Updated grunt and stuff