Stronger statement on skipped tests.  Minor additional mods.
Merge branch 'issue18' into devel