Escape ID before using it as a regexp (since + is a special character)
Merge pull request #56 from Metaswitch/escape-for-regexp

Reviewer Rob - Escape ID before using it as a regexp (since + is a special character)