Merged MPEProtocol and MPEProtocol2, changed calls throughout
Merge pull request #2 from ryanbartley/mergeProtocol

Merged MPEProtocol and MPEProtocol2, changed calls throughout