Support for phtml files
PHP is a better highlight for phtml files
Merge pull request #122 from alexandrevez/master

Support for phtml FileType
fix term-ansicolor version to prevent warnings spam on rake test:scanners (#128)
Merge branch 'master' of github.com:rubychan/coderay
unfreeze TokenKinds hash, allow changes
two fixes for CSS scanner
treat empty token as error in Debug encoder
avoid empty tokens in Diff output, fix split_into_parts
update .gitignore
bump version to 1.1.0
don't allow \x00 in diff filenames
do not warn about plugin fallback
Merge branch 'master' into sass-scanner

Conflicts:
	lib/coderay/scanners/css.rb