Merge remote-tracking branch 'ryanjulian/imageproc2.5-integration' into imageproc2.5-integration
cs note
Ron's changes
bleep bloop blinky lights
changes to debug mode
Merge remote-tracking branch 'ryanjulian/imageproc2.5-integration' into imageproc2.5-integration
Merge branch 'imageproc2.5-integration' of git://github.com/dhaldane/imageproc-lib into imageproc2.5-integration

Conflicts:
	ams-enc.c
	ams-enc.h
	amsCtrl.c
	tih.c