Vagrantfile: Only one of the URLs works

Looks like the new URL was added in but some mangling happened in the
history and therefore it stopped working "out of the box" again.

This small commit should now allow fresh clones to build clusters.
Vagrant: The OSDs are numbered 012 not 123
Merge pull request #23 from dotwaffle/master

Fix Vagrantfile URLs
Fixing parameters
Pulling changes from upstream
Global params