switch to using GitHub copy of SageDynamics et al.

I lost a bunch of changes to those, will have to redo them
Recovered from lost edits, project back together: 1 sp, 2 sp, ZNGI with constraint