Merge pull request #36 from knz/snet-master

Miscellaneous fixes to the configuration / build / test system (no functional/API changes)