ohmyzsh desktop
Merge branch 'master' of js-gh:jcswart/dotfiles

Conflicts:
	.oh-my-zsh/plugins/extract/extract.plugin.zsh
	.oh-my-zsh/plugins/forklift/forklift.plugin.zsh
Updates