remove crusty ol' RemoteLogger
merging stuff from master... to master?

(I think I got a merge conflict, but I don't see the conflict)