Remove rvm and nvm
Add branch name to prompt