Adjustments for new directory structure.
Update Vagrant to 1.3.5.
Various adjustments for new directory structure.