Updates to incorporate latest version of scpromise.  Also adjusted the build and source to be more generic to more easily drop in source files from scpromise