Will/vagrant updates

Some more updates.

@feanil