Cleaning

Dealing with all of the filter-branches and rebasing that gets me sleek, small repos... and lots of follow-up headaches.