Updated regular expression parsers to fix a parse error

Plus signs in the line were causing parser errors for this line:

    @@ -16,16 +16,7 @@ log = logging.getLogger('mitx.' + 'modulestore')

To fix, I added a check in the regex for the terminating @@ sequence.

Jay, please review.