Merge branch 'master' into sanritz
add vagrant plugin of oh my zsh
Merge branch 'sanritz'