sync after HD died

Getting everything back on the same page. Some stuff added that I
worked on on the other computer.
Fixing conflicts (hopefully)

fixed conflicts with old commits (not sure where they came from in the
first place, but they happened after the HD fried.