Makefile: just build key_reader with the same objs as fish
Fix segfault in status builtin
Fix documentation on variable scopes for `read`

The `read` docs incorrectly asserted that -g was the default for
variables. In actuality it behaves the same way that `set` does.
Add docs for vi mode

fixes #1536
Fix minor syntax and capitalization mistakes in vi mode docs
Merge pull request #1559 from davidxia/add-vi-mode-docs-fixes

Fix minor syntax and capitalization mistakes in vi mode docs
Add grunt completion
Select the 4th line of output, instead of the second to last line
"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
Merge branch 'master' into docopt
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