# HG changeset patch
# User Meredith Howard <mhoward@roomag.org>
# Date 1423716449 18000
# Node ID fb8391e370940771772f427b46644d72ae8d394b
# Parent  48af2ec782e08e0532d8ae4d4df4d5b548026466# Parent  efbe6857dc96f9fddf833704b98b2e8511e92532
merge from default

diff --git a/.gitconfig b/.gitconfig
--- a/.gitconfig
+++ b/.gitconfig
@@ -16,3 +16,5 @@
 	outgoing  = log @{u}..
 	glog      = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --date=relative
 
+[branch]
+	autosetuprebase = always
diff --git a/.vimrc b/.vimrc
--- a/.vimrc
+++ b/.vimrc
@@ -59,6 +59,8 @@ end
   Plugin 'bling/vim-airline'
   Plugin 'bling/vim-bufferline'
 
+  Plugin 'editorconfig/editorconfig-vim'
+
   Plugin 'Shougo/vimproc.vim'
   Plugin 'Shougo/unite.vim'
   Plugin 'Shougo/vimshell.vim'
diff --git a/.zshrc b/.zshrc
--- a/.zshrc
+++ b/.zshrc
@@ -4,8 +4,8 @@ export ZSH=$HOME/.oh-my-zsh
 ZSH_THEME="mhoward"
 ZSH_CUSTOM=~/.oh-my-zsh.cust
 
-# trust in github?
-DISABLE_UPDATE_PROMPT="true"
+DISABLE_AUTO_UPDATE="true"
+# DISABLE_UPDATE_PROMPT="true"
 
 plugins=( common-aliases gitfast )