Improve .emacs
Fix zshrc compatibility with OS X