Updated to match new api in Firefox33
Merge pull request #1 from ethanhugg/Firefox33

Updated to match new api in Firefox33
Updated to match the changes on Mozilla-Inbound.
Merge pull request #2 from ethanhugg/FF34-changes

Updated to match the changes on Mozilla-Inbound.
Merge pull request #1 from mozilla/master

Update