Cleanup
Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitmodules
	shell/.exports
	zsh/.zshrc