Preparing system for upgrade after failed attempt

[deadflowr]

I suppose I should reset all the repository settings back, but I can't find it now, it's all really different.

Just find Software and Updates in which ever menu system your logged in with.
You can also try either to find Software Sources (some still use this as the name) or run

software-properties-gtk

Another is that there are about a half dozen options at log-in - SEVERAL Gnomes, Ubuntu (unity), and not Cinnamon which I removed. Before the update there were less, even before I removed Cinnamon

Depends on how you removed them.
If you removed certain packages but not the various *-desktop meta-packages then they'd just reinstall the missing packages to fulfill the meta-package requirements.

[RogerDavis]

I think I got the repository stuff, except there were two identical ones for GoogleEarth - but I do have both regular GoogleEarth, and Pro. Not sure how to handle this one...

The big surprise was all the Gnome log-in choices. All that was showing before the upgrade was Gnome Flashback and Metacity, now there are several more.

Thanks!