Cleanup and standardize omnibus-software definitions

Updated in 13b8cf1