Add emacs and zsh
Merge branch 'master' of github.com:DigitalDemiurge/dotfiles