Hi Dan, I'll work with you to help get this ready for merge since @pamo needs to take care of some other things right now. 

You are correct that `git revert` is the right way to "undo" commits. `git revert` creates a new commit that undoes or does the opposite of whatever commit you revert. Go ahead and revert any commits that you don't want to include. Alternatively you can revert the commits by hand if you already started down that path. 

I'm going to look this branch over and see if we can get it ready. Thanks for helping get things together! :-)

Cheers,
Edward