Merge branch 'master' of github.com:cinaeco/dotFiles

vim/vimrc

@@ -11,6 +11,10 @@ call pathogen#infect()
 set nocompatible "Don't have to try to be compatible with old vi
 set autoread "Read a file if it's changed from outside of vim
 
+if version >= 700
+    set mouse=a "mouse support for 7.x
+endif 
+
 " Source the vimrc file after saving it
 autocmd! bufwritepost .vimrc source $MYVIMRC
 
@@ -19,7 +23,7 @@ autocmd! bufwritepost .vimrc source $MYVIMRC
 "" Formatting
 """"""""""""""""""""""""""""""""""""""""""""""""""""""
 
-set tabstop=4 "actual tab presses
+set tabstop=4 "actual tab press distance
 set shiftwidth=4 "for autoindent
 set softtabstop=4 " let backspace delete indent
 set expandtab "change to single spaces

zsh/zshrc

@@ -200,3 +200,4 @@ alias danshui='ssh weiyi@danshui'
 alias elrond='ssh weiyi@elrond'
 alias samwise='ssh weiyi@samwise'
 alias tfine='ssh cinaeco@tfine'
+alias blackomelette='ssh cinaeco@10.0.1.1'