Upgrade grunt

OK, so I finally got around to upgrading the gruntfile properly (I hope).