zsh prompt changes; .emacs cleanup
changed naming, other fixes