Various upgrades on grunt config