Cleanup and standardize omnibus-software definitions

touch has built-in automagic mkdir_p?