"webconfig.py: Don't allow NoneType as buffer, fallback to bytes.
Fixes TypeErrors when using bindings tab"
Updated code to parse bindings in webconfig.py
Merge branch 'master' of github.com:fish-shell/fish-shell
Allow parse_util_detect_errors to treat incomplete strings as errors

Fixes bug where sourcing a file with an unclosed quote would not have a
backtrace
Avoid using OptionParser to parse bindings in webconfig.py

OptionParser eats commaandline arguments passed to bind actions, so avoid using it.
Add support for history --merge to incorporate history changes from
other sessions.

Fixes #825
Clean up default environment variables.

This stops unconditionally setting values for HOME and USER,
if we find those values in the environment. It also saves about 16KB
on OS X, which getpwuid allocates.
Make abbreviations work correctly with type-ahead

Fixes #1434
Teach fish to compute the length of more escape sequences.

Fixes #1243
Fix fish_config error with python3

Closes #1253.
Fix umask function regex

Some grep implementations complain of empty subexpression

fixes #1313
Make prompt selection more like color selection in fish_config. Remove
the "show prompt source" button.
Render sample prompts faster in fish_config  by using a thread pool
Improve history robustness against corrupt files

Fixes #1581
Fix bad example in docs for test -n $MANPATH

Fixes #1574
add completions for Node.js & NPM
Add support for toor account.

Currently fish doesn't recognize toor as special. However, it's likely
that on BSD systems, fish shell will be used on toor, not on root (toor
is an intentionally existing account to use more advanced shell on, like
shell).
Parse OSC codes in escape_code_length(). They begin with <esc> ] and are terminated with ST (<esc> backslash) or BEL (ASCII 7).
Fix up OSC / iTerm2 escape code parsing as part of #1565
Merge branch 'master' into documentation-update

Conflicts:
	doc_src/history.txt
	doc_src/test.txt