Merge non-screen history and save history after every command
Merge branch 'master' of github.com:chronos-tachyon/dotfiles