diff --git a/bootstrap-mac.sh b/bootstrap-mac.sh
index 51ac604..24b3d7e 100644
--- a/bootstrap-mac.sh
+++ b/bootstrap-mac.sh
@@ -21,7 +21,7 @@ brew install wget --enable-iri
 brew install weechat --with-aspell --with-python --with-ruby
 brew install ranger
 brew install bash
-brew install fish
+brew install zsh
 brew install ack
 brew install tree
 brew install imagesnap
@@ -78,7 +78,6 @@ pip install --upgrade pip
 pip install git+git://github.com/Lokaltog/powerline
 
 # Ruby TODO -- set up chruby, ruby-install some stuff
-# https://github.com/JeanMertz/chruby-fish
 ruby-install ruby 1.9
 ruby-install ruby 2.1
 chruby 1.9
@@ -89,11 +88,6 @@ gem install earthquake
 # Node packages TODO
 # Cabal packages TODO
 
-# Change to fish shell
-# TODO check if it's already in there first!!
-echo "/usr/local/bin/fish" | sudo tee -a /etc/shells
-chsh -s /usr/local/bin/fish dustinswan
-
 # Sane OS X defaults
 bash ~/dotfiles/osx
 
diff --git a/config.fish b/config.fish
index b19aee5..19d7ece 100644
--- a/config.fish
+++ b/config.fish
@@ -29,8 +29,8 @@ alias dswan "ssh root@dswan.insors.net"
 alias webdev 'ssh -t root@webdev.insors.net "cd /var/www/html; /bin/bash -i"'
 
 # chruby-fish: https://github.com/JeanMertz/chruby-fish
-. /usr/local/share/chruby/chruby.fish
+#. /usr/local/share/chruby/chruby.fish
 # source /usr/local/share/chruby/auto.fish # SERIOUSY BROKEN
 
 # GPG
-~/dotfiles/bin/gpg-agent.sh
+#~/dotfiles/bin/gpg-agent.sh
diff --git a/zshrc b/zshrc
index 875ed23..ae06a11 100644
--- a/zshrc
+++ b/zshrc
@@ -9,21 +9,24 @@ bindkey -e
 alias vi=vim
 alias l="ls -la"
 alias tmux="tmux -2"
+alias ta="tmux attach -d"
 alias dustinswan="mosh dustinswan@dustinswan.org"
 export EDITOR=vim
 export TERM="screen-256color"
+export MOSH_TITLE_NOPREFIX=1
 
 export BROWSER=open
 [[ -s luakit ]] && export BROWSER=luakit
 
-alias browse='open'
-[[ -s luakit ]] && alias browse='luakit'
+alias browser='open'
+[[ -s luakit ]] && alias browser='luakit'
 
 # IOCOM stuff
 export P4USER=dswan
 export P4PORT="humu.insors.net:1666"
 export P4CONFIG=p4.cfg
 export P4EDITOR=vim
+alias p4vimdiff "set -x P4DIFF vimdiff; p4 diff"
 alias visidev="ssh root@visidev.iocom.com 'cd /; p4 sync'; scp /opt/iocom/user/webclient/all_desktop.js root@visidev.iocom.com:/opt/iocom/user/webclient/; scp /opt/iocom/user/webclient/css/all_desktop.css root@visidev.iocom.com:/opt/iocom/user/webclient/css/"
 alias dswan="ssh root@dswan.insors.net"
 alias webdev='ssh -t root@webdev.insors.net "cd /var/www/html; /bin/bash -i"'
@@ -35,11 +38,12 @@ export PATH=$HOME/Library/Haskell/bin:$PATH # Haskell
 export PATH=$HOME/dotfiles/bin:$PATH # Dotfiles bin
 export PATH=/usr/local/share/npm/bin:$PATH # npm
 export NODE_PATH=/usr/local/lib/node
+export PYTHONPATH=$PYTHONPATH:/usr/local/lib/python2.7/site-packages
 
 # Chruby
 if [[ -e /usr/local/share/chruby ]]; then
-    source '/usr/local/share/chruby/chruby.sh'
-    source '/usr/local/share/chruby/auto.sh'
+    source /usr/local/share/chruby/chruby.sh
+    source /usr/local/share/chruby/auto.sh
 fi
 if [[ -e /usr/share/chruby ]]; then
     source /usr/share/chruby/chruby.sh
@@ -49,3 +53,6 @@ chruby $(cat ~/.ruby-version)
 
 # GPG
 ~/dotfiles/bin/gpg-agent.sh
+
+autoload predict-on
+predict-on