add reference to vagrant setup provided by Jan Collijs.
Merge remote-tracking branch 'origin/master'