updated for vagrant 1.1.

sorry. conflict was fixed