Update prezto
Fix overrides (BRACE_CCL)
Merge remote-tracking branch 'upstream/master'

Conflicts:
	config_overrides/zpreztorc