Change how we pick distro-specific options

If the distro contains a '-', use the first part of it
to pick distro-specific options.  This allows us to do
something like 'precise-testing' and still have it pick
the correct kernel arguments.  This may not DTRT for
raspbian-wheezy
Add multiverse to Ubuntu sources.list files

Enable the multiverse component in the chroots