different comp
Merge branch 'master' of https://github.com/finbarrocallaghan/dotfiles

Conflicts:
	zshrc
missed in the merge for some reason
removed all traces of OMZ! :)
Merge branch 'master' of https://github.com/finbarrocallaghan/dotfiles