Updated packages, improved Gruntfile