Be more explicit about Python 2/3 shimming
Merge branch 'master' of github.com:Xion/unmatcher

Conflicts:
	unmatcher.py
Remove unnecessary imports