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, added some additional parsing of the hunk line (split into components at `@@` symbols before parsing for the start line number).

Jay, please review.