Do a better job of updating README per Vagrant changes.
Reword build step description
Merge branch 'master' into php54