left over changes
Merge branch 'master' of github.com:schelcj/scripts

Conflicts:
	sph_modules_conf.ini