Get rid of unused aliases.
Add the git branch on the RPROMPT.
Pandora stuff.