fix cond for terminal title
Merge branch 'master' of github.com:10sr/dotfiles

Conflicts:
	emacs.el