Fix ordering of bash completion, so __git_ps1 is available
Bring back __git_ps1 and add ruby version things