[Fix #563] Control+Arrow keys are not in the terminfo database
Convert tabs to spaces
Only one newline at end of file
[Fix #595] Simplify the handling of the Terminal.app proxy icon
Merge branch 'master' of https://github.com/sorin-ionescu/prezto

Conflicts:
	runcoms/zlogin
	runcoms/zprofile
	runcoms/zshenv
	runcoms/zshrc