Updated to match gmp-api changes for Firefox33
Changed gmp-api branch to master and astyled the changes.
Merge pull request #1155 from ethanhugg/gmpapi-ff33

Updated to match gmp-api changes for Firefox33