Ignored fish functions.
Mercurial aliases.
Deactivated a few mappings that were causing trouble under OSX.
Changed diff tool.