docker does not need sudo anymore
Merge branch 'master' of github.com:FreekKalter/zsh-conf

Conflicts:
	.zsh_aliases