From 1c667013479306cde66176c097ce24a03a8271aa Mon Sep 17 00:00:00 2001
From: Dustin Swan <dustinswan@gmail.com>
Date: Sat, 14 Apr 2012 21:57:28 -0500
Subject: [PATCH 1/3] Added Marked mapping to vim

---
 vimrc | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/vimrc b/vimrc
index 91055c7..600176c 100644
--- a/vimrc
+++ b/vimrc
@@ -167,3 +167,6 @@ nnoremap <leader>w <c-w>v<c-w>l
 
 " open Ack
 nnoremap <leader>a :Ack 
+
+" Marked
+:nnoremap <leader>m :silent !open -a Marked.app '%:p'<cr>

From 6ea70277d1fd425f0f95df3cda80d8b9e19fa498 Mon Sep 17 00:00:00 2001
From: Dustin Swan <dustinswan@gmail.com>
Date: Thu, 26 Apr 2012 09:32:27 -0500
Subject: [PATCH 2/3] Fixing up PATH and adding Postgres bin to path.

---
 vim/bundle/vundle | 2 +-
 zshrc             | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/vim/bundle/vundle b/vim/bundle/vundle
index 03ed2bd..dd8356a 160000
--- a/vim/bundle/vundle
+++ b/vim/bundle/vundle
@@ -1 +1 @@
-Subproject commit 03ed2bd39e37c5ff035c05197af81558eb5d8a89
+Subproject commit dd8356aea7499fed92f7c37227b1625a2b3dc190
diff --git a/zshrc b/zshrc
index 1369dea..50b4787 100644
--- a/zshrc
+++ b/zshrc
@@ -32,7 +32,6 @@ source $ZSH/oh-my-zsh.sh
 # Customize to your needs...
 alias vi=vim
 export EDITOR=vim
-export PATH="/usr/local/bin:$PATH"
 
 # VCS stuff
 export P4USER=dswan
@@ -44,4 +43,6 @@ export SVN_EDITOR=vim
 # sync visidev to latest Perforce
 alias visidev="ssh root@visidev.iocom.com 'cd /; p4 sync'"
 
-PATH=$PATH:$HOME/.rvm/bin # Add RVM to PATH for scripting
+export PATH=/usr/local/bin:$PATH # Homebrew
+export PATH=$HOME/.rvm/bin:$PATH # RVM
+export PATH=/Applications/Postgres.app/Contents/MacOS/bin:$PATH # Postgres

From 6feef7da6212e68bb2783ef777fe8185d3f0aa29 Mon Sep 17 00:00:00 2001
From: Dustin Swan <dustinswan@gmail.com>
Date: Sun, 29 Apr 2012 14:32:54 -0500
Subject: [PATCH 3/3] Adding haskell to path, organizing tmux conf

---
 tmux.conf         | 16 ++++++++--------
 vim/bundle/vundle |  2 +-
 zshrc             |  1 +
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/tmux.conf b/tmux.conf
index 17a19c5..7eae20c 100644
--- a/tmux.conf
+++ b/tmux.conf
@@ -1,19 +1,20 @@
-# command prefix (like screen)
-# set -g prefix C-a
-# bind C-a send-prefix
-
-# Set the prefix to ^A.
+# Set the prefix to ^A
 unbind C-b
 set -g prefix C-a
-bind C-a send-prefix
+bind a send-prefix
+
+# Start numbering at 1
+set -g base-index 1
 
 # I must be missing something..
 bind C-n next-window
 bind C-p previous-window
 bind C-c new-window
-bind C-a last-window
 bind C-d detach
 
+# handy
+bind C-a last-window
+
 # basic settings
 set-window-option -g mode-keys vi # vi key
 set-option -g status-keys vi
@@ -40,4 +41,3 @@ set -g status-left '#[fg=colour238,bg=colour234,nobold]⮀'
 set -g status-right '#[fg=colour245]⮃ %R ⮃ %d %b #[fg=colour254,bg=colour234,nobold]⮂#[fg=colour16,bg=colour254,bold] #h '
 set -g window-status-format "#[fg=white,bg=colour234] #I #W "
 set -g window-status-current-format "#[fg=colour234,bg=colour39]⮀#[fg=colour16,bg=colour39,noreverse,bold] #I ⮁ #W #[fg=colour39,bg=colour234,nobold]⮀"
-#
diff --git a/vim/bundle/vundle b/vim/bundle/vundle
index dd8356a..03ed2bd 160000
--- a/vim/bundle/vundle
+++ b/vim/bundle/vundle
@@ -1 +1 @@
-Subproject commit dd8356aea7499fed92f7c37227b1625a2b3dc190
+Subproject commit 03ed2bd39e37c5ff035c05197af81558eb5d8a89
diff --git a/zshrc b/zshrc
index 50b4787..f2e66cc 100644
--- a/zshrc
+++ b/zshrc
@@ -46,3 +46,4 @@ alias visidev="ssh root@visidev.iocom.com 'cd /; p4 sync'"
 export PATH=/usr/local/bin:$PATH # Homebrew
 export PATH=$HOME/.rvm/bin:$PATH # RVM
 export PATH=/Applications/Postgres.app/Contents/MacOS/bin:$PATH # Postgres
+export PATH=$HOME/Library/Haskell/bin:$PATH # Haskell