d3919ecf6b45

--- a/.hgsubstate	Fri Jun 14 12:18:01 2013 -0400
+++ b/.hgsubstate	Fri Jun 14 17:10:17 2013 -0400
@@ -17,7 +17,7 @@
 a1433c485eb254838c1db52e087d5ec4d1e77cfd vim/bundle/nerdtree
 f45b4529dd282393f2e08306ae161d77de0051a0 vim/bundle/orgmode
 2af074850fde676743f655775e3e151925751adf vim/bundle/powerline
-cd6aec27d127053d18bd2a12713137e41d054208 vim/bundle/python-mode
+1b4b8f1a8f1c88d8caae6c1b12c22c52ef418f32 vim/bundle/python-mode
 613eb1c81261adfa5dead315089c432ff6dbbc51 vim/bundle/repeat
 61a7567a3cdd68cb65ceb3061071ce66d8110e65 vim/bundle/salt
 7eb00bb460f91dcb347b23198dff343b4d8e92a9 vim/bundle/slimv

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/bin/mvim	Fri Jun 14 17:10:17 2013 -0400
@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+
+PATH=~/.vim/bullshit:$PATH $MVIM_BINARY "$@"

--- a/fish/config.fish	Fri Jun 14 12:18:01 2013 -0400
+++ b/fish/config.fish	Fri Jun 14 17:10:17 2013 -0400
@@ -56,6 +56,22 @@
 function collapse; sed -e 's/  */ /g'; end
 function cuts; cut -d' ' $argv; end
 
+function emptytrash -d "Empty the OS X trash folders"
+    sudo rm -rfv /Volumes/*/.Trashes
+    sudo rm -rfv ~/.Trash
+    sudo rm -rfv /private/var/log/asl/*.asl
+end
+
+function urlencode
+    python -c "import sys, urllib as ul; print ul.quote_plus(sys.argv[1]);" $argv
+end
+
+function fix_open_with -d "Fix the shitty OS X Open With menu duplicates"
+    /System/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/LaunchServices.framework/Versions/A/Support/lsregister -kill -r -domain local -domain user
+    killall Finder
+    echo "Open With has been rebuilt, Finder will relaunch"
+end
+
 function v; vim $argv; end
 function V; vim . $argv; end
 
@@ -175,12 +191,12 @@
 set -g -x NODE_PATH "/usr/local/lib/node_modules"
 
 set -g -x VIM_BINARY "/usr/local/bin/vim"
+set -g -x MVIM_BINARY "/usr/local/bin/mvim"
 
 # }}}
 # Python variables {{{
 
 set -g -x PIP_DOWNLOAD_CACHE "$HOME/.pip/cache"
-set -g -x PYTHONSTARTUP "$HOME/.pythonrc.py"
 set -g -x WORKON_HOME "$HOME/lib/virtualenvs"
 
 prepend_to_path "/usr/local/share/python"