Remove some old Schrodinger cruft
Merge remote-tracking branch 'origin'