The best possible solution I could come up with and should work for everyone that has vagrant 1.1 one way or another, I'll merge it ok ?