adds other submodules
Merge branch 'master' into cana

Conflicts:
	zsh-completions