Merge pull request #159 from msysgit/vagrant