Fixed a bug in which adding/deleting lines in different diff reports
would result in reports that included the deleted lines.
Merge branch 'master' into will/inter-diff-conflicts
Updated CHANGELOG
Added test case for @@ symbol at the end of the hunk line.
Changed parsing of hunk line into two steps; a split on @@ symbols,
then using a regex to get the start line number.
Added clarifying comments about hunk lines
Merge pull request #12 from edx/will/fix-parse-error

Updated regular expression parsers to fix a parse error
Updated to version 0.1.3
Merge branch 'master' into will/inter-diff-conflicts

Conflicts:
	CHANGELOG
Merge pull request #11 from edx/will/inter-diff-conflicts

Bug fix: Deleted lines included in report
Added MANIFEST.in for PyPi upload

Incremented version to 0.1.4 for PyPi release.
Merge branch 'master' into will/jinja2-templates

Conflicts:
	CHANGELOG
	diff_cover/__init__.py