ZSH: Fix RVM loading
ZSH: move ls colors and xterm-256 setting to zshrc so they’re only used in login shells
merge diverging heads