Upgrade underscore and underscore.string