Fixes for Vagrant 1.5.x plus rake improvements