More helpers

bash_aliases

@@ -15,3 +15,5 @@ alias bx="b exec"
 alias binit="bi && b package && echo 'vendor/ruby' >> .gitignore"
 alias kill_rails="pkill -9 -f 'rails'"
 alias http_server="python -m SimpleHTTPServer"
+
+alias redock="killall Dock"

vimrc

@@ -83,7 +83,7 @@ set wildmenu
 set showmatch
 set matchtime=2
 
-set wildignore+=*.o,*.obj,.git,public/assets/**,tmp/**,*.gif,*.png,*.jpg,*.jpeg,*.eot,*.ttf,*.woff,*.gem,*.swf
+set wildignore+=*.o,*.obj,.git,public/assets/**,tmp/**,*.gif,*.png,*.jpg,*.jpeg,*.eot,*.ttf,*.woff,*.gem,*.swf,log/**
 
 source ~/.vim/autocmd.vim
 source ~/.vim/keybindings.vim

zshrc

@@ -10,6 +10,7 @@ ZSH_THEME="jreese"
 
 export PB_CLIENT_TYPE=Zmq
 export PB_IGNORE_DEPRECATIONS=1
+export GIT_MERGE_AUTOEDIT=no
 
 # Set to this to use case-sensitive completion
 # CASE_SENSITIVE="true"