README tweak for configuration
Change vagrant box alias
Add block comment for vasshin to work
Fix conflict
Fix code block
Merge branch 'master', remote-tracking branch 'upstream/master'