All recent changes
Merge branch 'master' of github.com:thirdeye/dot

Conflicts:
	tmux.conf
	zshrc