Merge remote-tracking branch 'cmyth/master'

Conflicts:
	SConstruct
Switch the language binding test scripts to use /bin/sh so that they can
run on systems where bash is not installed.
Merge remote-tracking branch 'origin/master'
Misc scons cleanup of the swig language bindings.