printf '\0' now works. Fixes #908.
Fixed ftp completions

Merged pull request at https://github.com/fish-shell/fish-shell/pull/919
Squashed commit of the following:

commit c0662a9d4da12ba49ffe1dddc918533f8a52b91f
Author: Siteshwar Vashisht <siteshwar@gmail.com>
Date:   Thu Jul 18 21:23:42 2013 +0530

    Added missing quote in ftp completions

commit 9ef408d0390f13be3adc02be62daae3e0f114843
Author: Konrad Borowski <glitchmr@myopera.com>
Date:   Thu Jul 18 15:33:57 2013 +0200

    Make punctuation consistent properly. Fixes #918.

commit ea26da0f8284fa39dc143e3d2ad088403fa6b2ed
Author: Konrad Borowski <glitchmr@myopera.com>
Date:   Thu Jul 18 15:29:02 2013 +0200

    Revert "make punctuation consistent"

    This reverts commit 993c02857948b45e5d17cc2696f347c73b3a450d.
Merge pull request #915 from GlitchMr/fix-printf

printf '\0' now works. Fixes #908.
Add completion for canto.
Fix canto completion

-d option was forgotten, causing error for last complete command
Avoid standard command not found message when command-not-found is found

Squashed commit of the following:

commit c208bc30b7747b3743212483b3dd7e3f90819f49
Merge: 97bea94 2633372
Author: Konrad Borowski <glitchmr@myopera.com>
Date:   Fri Jul 19 09:56:12 2013 +0200

    Merge branch 'command-not-found' of git://github.com/GlitchMr/fish-shell into command-not-found

commit 26333721b9048333d1e7932505c221a31fd0e624
Author: Konrad Borowski <glitchmr@myopera.com>
Date:   Fri Jul 19 09:55:13 2013 +0200

    Fix command_not_found when not found

commit db34460bb51a4b1c1c456c2e535ae8d913d1071e
Author: Konrad Borowski <glitchmr@myopera.com>
Date:   Wed Jul 17 13:41:57 2013 +0200

    Avoid showing standard command not found message when possible

    In bash, command-not-found handler causes the standard messages to
    not appear. Because of events model in fish, it isn't really an
    option, so I moved the standard command not found message to
    fish function. This way, the messages aren't repeated, and the
    standard command not found message appears only when handler
    couldn't be found.
Initial abbreviation work. Tests currently fail.
Next stab at abbreviations. Highlighting should work.
Fix make command completion. Fixes issue #928.

Previously, TAB on make CC=/us caused CC=/us/usr/ to appear. This
commit fixes this, by properly removing part after equals sign.
git_prompt: Reorder show_upstream to match original

This makes it easier to see if there are any changes.  Also it puts
all of the extra functionality together instead of mixed in with
everything else.
git_prompt: Merge operation, branch, and bare helpers

Operation and branch detection are merged together in the original
because branch information may come from different places depending on
the operation.

Merging the bare helper in helps avoid testing for the working
directory and bare status twice, both of which requires forking a new
process.

Also helps the code match the original more, which will make adding
new features easier.
git_prompt: Add branch information for rebase
git_prompt: Update documentation

* The original __git_ps1 function has split from the rest of
  git-completion as of git.git af31a45

* Use the description for GIT_PS1_DESCRIBE_STYLE (added in git.git
  50b03b0) for __fish_git_prompt_describe_style

* Update the description of __fish_git_prompt_showupstream to include
  the meaning of '=' based on git.git f9db192: "Improve the
  description of GIT_PS1_SHOWUPSTREAM"

* Note that the PROMPT_COMMAND versions of the command with extra
  arguments don't work, in case someone used to the bash version is
  looking for it.

* Note that I am updating the script so Kevin Ballard doesn't get
  blamed for anything I break.
git_prompt: Expand color/character explinations

This will be getting more complicated when I add the showcolorhint
option from git.git.
git_prompt: Add defaults to set_color

This is mostly useful for the next commit that will have different
colors default to different values, but it has one immediate change:
all __fish_git_prompt_color_* variables now default to
__fish_git_prompt_color instead of to nothing, as they used to.
git_prompt: __fish_git_prompt_showcolorhints

Based on GIT_PS1_SHOW_COLORHINTS, it introduces more color by default
and also changes the color of the branch name based on if it is a real
branch or detached.

Based on the following commits from git.git:

9b7e776: show color hints based on state of the git tree
9b3aaf8: Fix up colored git-prompt
76c36c0: coloured git-prompt: paint detached HEAD marker in red
git_prompt: add bash.showUntrackedFiles option

The option was added in git.git 66cb5d4, so pay attention to it like
we do the other bash.* options.
git_prompt: use REVERT_HEAD

git revert was taught to revert multiple commits, and it stores it
branch information in REVERT_HEAD just like the other *_HEAD files.

based on git.git 3ee4452: bash: teach __git_ps1 about REVERT_HEAD
git_prompt: show where rebase is at when stopped

Adds a progress indicator to the rebase messages. (e.g. |REBASE 2/5)

based on the git-prompt portion of git.git b71dc3e: "bash-prompt.sh:
show where rebase is at when stopped"
git_prompt: Add __fish_git_prompt_char_stateseparator

Unlike the rest of the __fish_git_prompt_char_* variables, it does not
have its own color because the most likely values are a space and
nothing.

based on git.git 15a54fb: prompt: introduce GIT_PS1_STATESEPARATOR