various cleanup

Just some spring cleaning; probably best to view [here](https://github.com/localshred/protobuf/pull/234/files?w=1) to ignore whitespace
right, but the `if rc == 0 && !running?` check was first, then the `rc == -1`. You've reversed that order, wondering why.