Update software definitions to latest version of DSL
DAT TRAILING WHITESPACE!
Merge branch 'omnibus-1.0'