Some screwing around
Merge branch 'master' of github.com:johnpeck/protoscript

Conflicts:
	progress.org
	python/syscomp/cgr_capture.py
	python/syscomp/cgrlib.py
Added TODO for filling the trigger dictionary