Update to use latest civicrm_gem