Merged MPEProtocol and MPEProtocol2, changed calls throughout

I'm fixing my server on your protocol so I wanted to merge everything into one since we'll be the first ones to use mpe with cinder. I also changed some of the naming conventions to match more cinder's paradigm.