--- a/.hgignore	Wed Dec 21 21:44:01 2016 -0800
+++ b/.hgignore	Wed Feb 15 23:01:48 2017 -0800
@@ -16,4 +16,5 @@
 mutt/variables
 pentadactyl/.pentadactyl
 pentadactyl/info
-
+fish/fish_history
+fish/fishd.*

--- a/.hgsubstate	Wed Dec 21 21:44:01 2016 -0800
+++ b/.hgsubstate	Wed Feb 15 23:01:48 2017 -0800
@@ -4,7 +4,7 @@
 7d99080f276f49e3638ba13b4f5c1cd2dc4cc21f lib/hg/hg-git-sync
 5334581e231a5167d03689ff47b3a6fdf082011c lib/hg/hg-prompt
 1fc4a9fbead7e0acc4c828b346f3be2658ec3df9 lib/hg/mercurial-cli-templates
-ba9fabaca91b0897cffb7048d81193e44d440948 lib/hg/mutable-history
+05d15886aaebcee15a372fc28584766e4e7553bd lib/hg/mutable-history
 d920e3425db554497a2cfaf1a2548eafbdc8b0e7 lib/hg/onsub
 93a1b8620610e4e6691b7d50a48d4ce0100f9189 lib/hg/path-pattern
 2d9820cf595263bc7c651295b83f02525a23ca4a lib/hg/terse-status
@@ -19,11 +19,11 @@
 11632455de8caa40f264501df8f0a3e249cf0595 vim/bundle/easymotion
 b754bc2031f21a532c083dd0d072ba373bbe3a37 vim/bundle/fugitive
 9dd2d48255fcc3ac5122f6028dc238fabcccd861 vim/bundle/gundo
-f915393ff68d9e436146845663ae7f76cf2b2707 vim/bundle/gutentags
+40153c7a1887d02d8cbd631678fd69d33917f11f vim/bundle/gutentags
 1f2e47c78c2faf90ff419c2f4e1241094844678c vim/bundle/haml
 6de4e70228a2efd6459fa481faa6cada4147d5a3 vim/bundle/interestingwords
 8a8f0ed97c1751d304cf5b7241f2fe27b0e61f81 vim/bundle/jinja
-4d5f4233b04ecc052d9d46a5dab1f4155e50735f vim/bundle/lawrencium
+c9169233d45ae2f0fefa0feb9ee816a87c6b05c8 vim/bundle/lawrencium
 6e818d5614d5fc18d95a48c92b89e6db39f9e3d6 vim/bundle/less
 2060a88f6319176d250d167f5091ae3c3c457b2c vim/bundle/linediff
 3c2215bfed1de1251927fbc94b2631ca27c2958f vim/bundle/markdown

--- a/fish/config.fish	Wed Dec 21 21:44:01 2016 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,148 +0,0 @@
-
-# Environment variables {{{
-
-set -g -x fish_greeting 'Hello.'
-
-# Homebrew.
-set -g -x PATH /usr/local/sbin $PATH
-set -g -x PATH /usr/local/bin $PATH
- 
-# My own stuff.
-set -g -x PATH $HOME/.local/bin $PATH
-set -g -x PATH $HOME/bin $PATH
-set -g -x OS MacOSX
-set -g -x EDITOR vim
-
-# Python.
-set -g -x VIRTUAL_ENV_DISABLE_PROMPT 1
-
-# Go.
-set -g -x GOPATH /usr/local/Cellar/go/1.4/gocode
-
-# }}}
-
-# Aliases {{{
-
-alias tm 'tmux -u2'
-
-# }}}
-
-# Prompt {{{
-
-set normal (set_color normal)
-set magenta (set_color magenta)
-set yellow (set_color yellow)
-set green (set_color green)
-set gray (set_color -o black)
-
-function virtualenv_prompt
-    if set -q VIRTUAL_ENV
-        set_color -b blue white
-        printf '(venv:%s)' (basename "$VIRTUAL_ENV")
-        set_color normal
-        printf ' '
-    end
-end
-
-function prompt_char
-    if git branch >/dev/null 2>/dev/null 
-        printf '±' ; return
-    end
-    if hg root >/dev/null 2>/dev/null
-        printf '☿' ; return
-    end
-    echo '○'
-end
-
-function hg_prompt
-    set_color magenta
-    printf '%s' (fast-hg-bookmark 2>/dev/null)
-    set_color normal
-end
-
-function git_prompt
-    if git root >/dev/null 2>&1
-        set_color normal
-        printf ' on '
-        set_color magenta
-        printf '%s' (git currentbranch ^/dev/null)
-        set_color green
-        git_prompt_status
-        set_color normal
-    end
-end
-
-function fish_prompt
-    set last_status $status
-
-    echo
-
-    # 'username@hostname: '
-    set_color magenta
-    printf '%s' (whoami)
-    set_color normal
-    printf '@'
-    set_color yellow
-    printf '%s' (hostname|cut -d . -f 1)
-    set_color normal
-    printf ': '
-
-    set_color $fish_color_cwd
-    printf '%s' (prompt_pwd)
-    set_color normal
-
-    printf ' '
-    prompt_char
-    printf ' '
-
-    hg_prompt
-
-    echo
-
-    virtualenv_prompt
-
-    if test $last_status -eq 0
-        set_color white -o
-        printf '> '
-    else
-        set_color red -o
-        printf '[%d] > ' $last_status
-    end
-
-    set_color normal
-end
-
-# }}}
-
-# Directories {{{
-
-alias ..    'cd ..'
-alias ...   'cd ../..'
-alias ....  'cd ../../..'
-alias ..... 'cd ../../../..'
-
-alias md 'mkdir -p'
-
-# }}}
-
-# Virtualenv wrapper for Fish {{{
-
-eval (python -m virtualfish)
-
-#set -g VIRTUALFISH_COMPAT_ALIASES # uncomment for virtualenvwrapper-style commands
-#. $HOME/.config/fish/virtualfish/virtual.fish
-# optional plugins
-#. path/to/auto_activation.fish
-#. path/to/global_requirements.fish
-#. path/to/projects.fish
-
-# }}}
-
-# Local Settings {{{
-
-if test -s $HOME/.config/fish/local.fish
-    . $HOME/.config/fish/local.fish
-end
-
-# }}}
-