small fixes
improve vagrant instructions in ruby, js, python chapters
fix conflict