Consolidate rift_O4c + master + junior/rift_O4d into rift_O4d (and port the open O4c portfolio-driver fix) - #173

Consolidate rift_O4c + master + junior/rift_O4d into rift_O4d (and port the open O4c portfolio-driver fix)#173

oshaughn merged 94 commits into

oshaughn:rift_O4doshaughn/research-projects-RIT:rift_O4dfrom

oshaughnessy-junior:rift_O4d_consolidate_O4c_masteroshaughnessy-junior/research-projects-RIT:rift_O4d_consolidate_O4c_masterCopy head branch name to clipboard