Some more cleanup on vagrant file and bootstrap