work changes, ealiases included
Merge branch 'master' of https://github.com/finbarrocallaghan/dotfiles

Conflicts:
	tmux.conf
	zshrc