inline diff highlighting for multi-line changes (#227)
simplify multiline diff regexp
Merge branch 'master' into multiline-inline-diff

Conflicts:
	coderay.gemspec
yikes
Merge branch 'master' into multiline-inline-diff
Extracted code making HTML lines independent from numbering code to a specific option in encoder.
Fixing automatic type selection for html files.
update .travis.yml
replace weird regexp that confuses ruby-head
remove rbx-19mode from travis for now
Fixed handling of eols inside token content.
Added a unit test for HTML encoder (with a test for :line_independent option)
Merge remote-tracking branch 'dslh/master'
fix tests for #16
specify encoding of PHP scanner file (fails when RUBYOPT=-Ku is set)
Merge remote-tracking branch 'emassip/master' into independent-lines
here come the white-space nazis
rename :independent_lines option to :break_lines
ignore .DS_Store
Merge branch 'master' into independent-lines