Add a webserver role.
Simplify Vagrantfile
Merge branch 'master' into develop

* master:
  Update README.
Update default box for Vagrant.