initial import
Merge branch 'master' of https://github.com/da-wen/vagrant-2013