Tweak zshrc for backwards compatibility.
Tweak and clean up emacs config.
Merge branch 'master' of github.com:jezcope/dotfiles