Added support for more cases and preserved capitalization.

Changes:
* Used regex to match all cases and tried to preserve capitalization as much as possible via callback.
* Matched 'cloud' without requiring the preceding 'the'.
* Rebuilt xpi.