Changed all references from vbox.local to dev.vm

Missed these previously.
Merge branch 'dev' into 7.x-1.x