json
Merge branch 'master' of github.com:mies/vagrant
updated wercker.json