Make SoftwareSpiMaster use SoftwareSpiSimpleMaster.
Fix SoftwareI2cMaster template names in implementation.