Don't try to colorize errors when running in Xcode
Don't show "and 1 more rows" in pager if that requires a row
Accepting an autosuggestion should clear the pager
Make __fish_print_users work on OS X via dscl
Strip users with leading underscores from ssh completions
Use sgrep instead of grep in ssh completion
Support for command wrapping ("aliases")

Add the --wraps option to 'complete' and 'function'. This allows a
command to (recursively) inherit the completions of a wrapped command.
Fixes #393.

When evaluating a completion, we inspect the entire "wrap chain" for a
command, i.e. we follow the sequence of wrapping until we either hit a
loop (which we silently ignore) or the end of the chain. We then
evaluate completions as if the wrapping command were substituted with
the wrapped command. Currently this only works for commands, i.e.
'complete --command gco --wraps git\ checkout' won't work (that would
seem to encroaching on abbreviations anyways). It might be useful to
show an error message for that case.

The commandline builtin reflects the commandline with the wrapped
command substituted in, so e.g. git completions (which inspect the
command line) will just work. This sort of command line munging is
also performed by 'complete -C' so it's not totally without precedent.

'alias will also now mark its generated function as wrapping the
'target.
Make escape_string transform wildcard characters

The characters ANY_CHAR, ANY_STRING, and ANY_STRING_RECURSIVE are
currently transformed by unescape, but not by escape. Let's try escaping
them. Fixes #1614.
gitignore changes
Merge branch 'master' into documentation-update

Conflicts (FIXED):
	.gitignore
	doc_src/complete.txt
	doc_src/function.txt