add encoding support
Merge branch 'master' of https://github.com/bolitt/py-matchtpl

Conflicts:
	CHANGES.rst