can we keep merging into the boot2docker/boot2docker code?

I've just started testing on windows, and I can't even b2d init atm

looking at your diffs - this is not a problem for you? or has the mainline code moved on too fast?