Fixed #74:  VM name preference not respected in setup.
Merge pull request #90 from chrisolof/74-vm-name-fix

Fixed #74:  VM name preference not respected in setup.