Cleanup

At this point, I think this is just about ready to be released into the
world as the August 2014 release!