Cleanup and standardize omnibus-software definitions

that comment sort of has a purpose so that people know where to look for it and what the convention is on version numbering this.