Use 2-2-stable branch
Add vagrant
Update ruby version being used
Log exec output on failure
Merge branch '2.2'

* 2.2:
  Use 2-2-stable branch