Fixes Ruby version display on prompt
Adds endwise to vim
Fixes merge conflict