Updated npm dependiencies to new version notation and small changes to gruntfile