tox.ini: Add py33
Some quality tools allow command line flags to be passed in that cannot
be specified though config flags, add an option to pass these in.
Update readme to show options functionality
Merge pull request #75 from Bachmann1234/add_options

Add options
Combines adjacent lines in template reports
1, 2, 3, 4, 5 will display as 1-5

Hopefully leading to more digestible output
added myself to AUTHORS file
Merge pull request #72 from msabramo/tox_py33

tox.ini: Add py33
.travis.yml: Don't allow py34 failure
Merge pull request #81 from msabramo/travis_py34_no_allow_failure

.travis.yml: Don't allow py34 failure
Add more test cases
clearer implementation based on wedaly's suggestions
Merge pull request #80 from Bachmann1234/combine_adjacent_values

Combines adjacent lines in template reports
Convert to unicode when parsing git diff output and loading snippet source files

Unicode integration tests
Use six.binary_type instead of explicit version check; use BytesIO instead of StringIO
Merge pull request #83 from edx/will/diffcover-unicode

Unicode Fixes (Python 2.7)
Incremented version to 0.4.1
smartkiwi found a flaw in how we were loading in python source code
and nedbat helped me discover there is a standard way of loading
in python sources based on pep0263. Python3 includes this in the stdlib
under the tokenize lib, but ipython backported this to python2 so I
just brought in their library
Merge pull request #82 from Bachmann1234/read_in_python_source

Load python sources in a safer way
Merge branch 'master' into fix-snippets-relative-path

Conflicts:
	diff_cover/snippets.py
	diff_cover/tests/test_integration.py