unbind C-z
Merge branch 'master' of github.com:tompaton/prelude