new tmux-zoom script
modified some stuff
Merge remote-tracking branch 'upstream/master'

Conflicts:
	.aliases
	.pentadactylrc