Name vagrant machine so it isn't called 'default'
Cleanup up some samples