Removing (cached) files that shouldn't be in the repo anymore.  gitignore is already ignoring them.
Merging in.  This will re-enable all Log statements.  They will get fixed though.