Updates to emacs configuration and Ctrl-S disable for zsh
Merge branch 'master' of https://github.com/rkneufeld/dotconfig