rbenv
added some aliases
stop the rebase madness -- branch edition