Added git branch to PS1 and swapped rvm for rbenv
Added sts