Abstract box name and use add_machine_options, use machine_batch in mult...

...i-neutron, and remove (non-working) ubuntu boxes