Move shell stuff around

Before I soured my bashrc from my zshrc. This seemed reasonable until I
explained it to someone. This duplicates the $DOTFILES definition but
besides that is nicer.