not using screen term does in fact mess things up
Merge branch 'master' of ssh://github.com/calid/configz

Conflicts:
	etc/tmux.conf