Fixup protobuf parsing

Trim matched tokens, surrounding ws is not to be taken as a portion of any of the tokens we parse.
Cleanup pep8 lints.
Merge remote-tracking branch 'twitter/master'