Fixed diff aliases.
Updated theme layout, moved virtualenv to rprompt