Cleanup and standardize omnibus-software definitions

i think you need this.  if ruby-windows runs later it'll drop a libyaml that overrides this.