63033a83a6ff

--- a/.hgrc	Fri Dec 17 14:42:43 2010 -0500
+++ b/.hgrc	Fri Dec 17 16:33:46 2010 -0500
@@ -99,7 +99,7 @@
 cm = commit -m
 cus = commit -m 'Update subrepository state.'
 cuf = commit -m 'Update fixtures.' -I '**fixtures**.json'
-cmwn = commit -m 'Merge with Nick.'
+cmm = commit -m 'Merge.'
 
 mergelocal = $HG --config ui.merge=internal:local merge $@
 mergeother = $HG --config ui.merge=internal:other merge $@

--- a/.tmux.conf	Fri Dec 17 14:42:43 2010 -0500
+++ b/.tmux.conf	Fri Dec 17 16:33:46 2010 -0500
@@ -41,10 +41,10 @@
 bind v   split-window -h
 
 # moving between panes
-bind -n C-h select-pane -L
-bind -n C-j select-pane -D
-bind -n C-k select-pane -U
-bind -n C-l select-pane -R
+bind -n C-j select-pane -L
+bind -n C-k select-pane -D
+bind -n C-l select-pane -U
+bind -n C-g select-pane -R
 
 # resizing panes
 bind -n S-Down  resize-pane -D 10

--- a/vim/.vimrc	Fri Dec 17 14:42:43 2010 -0500
+++ b/vim/.vimrc	Fri Dec 17 16:33:46 2010 -0500
@@ -95,7 +95,7 @@
 noremap ; l
 
 " Easy buffer navigation
-" Note: For this section to make any sense you need to remap Ctrl-; to Ctrl-m at
+" Note: For this section to make any sense you need to remap Ctrl-; to Ctrl-g at
 "       the KEYBOARD level.  The reason is that for some reason the OS X doesn't
 "       recognize the Ctrl+; combination as something special, so it just passes it
 "       to Vim as a semicolon.
@@ -104,7 +104,7 @@
 noremap <C-j>  <C-w>h
 noremap <C-k>  <C-w>j
 noremap <C-l>  <C-w>k
-noremap <C-m>  <C-w>l
+noremap <C-g>  <C-w>l
 noremap <leader>w <C-w>v<C-w>l
 
 " Folding ----------------------------------------