Restoring from Dropbox backup

Well, it seems that the "phantom commits" really screwed something up.
Here's to fixing that. (Hopefully.)