Trying to make pid-ip2.5 module more general.
Merge branch 'pid-code-update' into devel

Conflicts:
	ams-enc.c