Update installation instruction to make them easier to understand the first time.
Merge remote-tracking branch 'upstream/master'
Update documentation to provide a more straight forward setup with vagrant
fix a typo
Merge pull request #2126 from JeremiePat/master

Update installation instruction