Git diff reporter now handles merge conflict format of diff
Updated CHANGELOG
Fixed a bug that would cause combined reports to always be 100% covered

Conflicts:
	diff_cover/violations_reporter.py
Incremented to v0.2.2, updated CHANGELOG
Update setup.py
Accept unicode filenames from git diff
Updated AUTHORS and version
Updated CHANGELOG
HTML report now includes snippets from source files
Fix a new py26 compatibility, and add it to travis.