Support term256 in config.fish. Fixes #1022.
Merge remote-tracking branch 'upstream/master'