cleanup
Merge branch 'master' of github.com:paullik/dotfiles

Conflicts:
	.oh-my-zsh/custom/example.zsh