[Fix #362, Fix #384] Set Mac OS X 10.6 terminal window title
Remove unused GNU Screen window number format
Rewrite terminal auto-title
Simplify auto-titling
Prefix internal functions
Unsufix internal functions
[Fix #324] Add configurable terminal window and tab title formats
Remove utility aliases for Cygwin
Warn that Cygwin is not supported
[Fix #503] Prefix rails aliases with 'bundle exec'
Fix heading level for "zpreztorc"
Merge branch 'master' of github.com:sorin-ionescu/prezto

Conflicts:
	modules/terminal/init.zsh