Switch to unit-based terminate. Add unit patterns.
Merge branch 'master' of github.com:jgbm/cpgv

Conflicts:
	test.gv