Merging from bbangert

Clear conflicts in jrconlin code and return to sanity.