cleaned up some error cases
Added C++ name variants
Merge branch 'master' of github.com:dgolds/dgbin

Conflicts:
	blamecount.sh
Merge branch 'master' of github.com:dgolds/dgbin

Conflicts:
	blamecount.sh