override ctrl-s only when stdin is a terminal
Merge branch 'master' of github.com:alanctkc/dotfiles