Clean up master after subversion conversion.

This cherry picks some old commits from develop, removes a file from the CVS days and then sets up a sensible merge base from develop.