# HG changeset patch
# User Steve Losh <steve@stevelosh.com>
# Date 1336489557 14400
# Node ID 119223f865822e1cc1c950d8b3b156622a794d0d
# Parent  7004f9ab85b413e17d50bd25dcb764c0987c1e83
Moar.

diff -r 7004f9ab85b4 -r 119223f86582 .hgsubstate
--- a/.hgsubstate	Tue May 01 11:06:18 2012 -0400
+++ b/.hgsubstate	Tue May 08 11:05:57 2012 -0400
@@ -3,7 +3,7 @@
 4d95cb18a3b420154ef978c53de1d2e692f8343d mercurial/templates
 d2bb7878622e4c16203acf1c92a0f4bc7ac58003 vim/bundle/AnsiEsc.vim
 9895285042a2fd5691b2f6582aa979e4d1bdffea vim/bundle/ack
-17443dcd6ceed84184d4e92dccc5d8f1f29e67b6 vim/bundle/badwolf
+0256648073658469f219c4f739da528d5325e215 vim/bundle/badwolf
 b528cf3de72884dd6cf5fdbeda375d7437ea811f vim/bundle/clam
 c4fe3045653877518ddbe776a9cb7cbd4fdd0bc8 vim/bundle/ctrlp
 667a668e114e9ec0e5d4cbcb0962d835b23614c4 vim/bundle/easymotion
diff -r 7004f9ab85b4 -r 119223f86582 gitconfig
--- a/gitconfig	Tue May 01 11:06:18 2012 -0400
+++ b/gitconfig	Tue May 08 11:05:57 2012 -0400
@@ -33,12 +33,18 @@
     uns = reset HEAD
 
     currentbranch = !git branch --contains HEAD | grep '*' | tr -s ' ' | cut -d ' ' -f2
+
     fo = fetch origin
     fu = fetch upstream
+
     po = push origin
-    lo = pull origin
+    ; lo = pull origin
+
     mo = !git merge --no-ff origin/`git currentbranch`
+    mu = !git merge --no-ff upstream/`git currentbranch`
+
     uo = !git merge --ff-only origin/`git currentbranch`
+    uu = !git merge --ff-only upstream/`git currentbranch`
 
     addremove = !git add . && git add -u
     addrem = !git addremove
diff -r 7004f9ab85b4 -r 119223f86582 vim/vimrc
--- a/vim/vimrc	Tue May 01 11:06:18 2012 -0400
+++ b/vim/vimrc	Tue May 08 11:05:57 2012 -0400
@@ -568,6 +568,7 @@
 augroup ft_clojure
     au!
 
+    au BufNewFile,BufRead riemann.config set filetype=clojure
     au FileType clojure call TurnOnClojureFolding()
     au FileType clojure compiler clojure
     au FileType clojure setlocal report=100000
@@ -884,6 +885,16 @@
 augroup END
 
 " }}}
+" Riemann Config Files {{{
+
+augroup ft_riemann
+    au!
+
+    au BufNewFile,BufRead riemann.config set filetype=clojure
+    au BufNewFile,BufRead riemann.config nnoremap <buffer> <localleader>= mzgg=G`z
+augroup END
+
+" }}}
 " Ruby {{{
 
 augroup ft_ruby
@@ -942,6 +953,7 @@
     au!
     au FileType htmldjango setlocal commentstring={#\ %s\ #}
     au FileType clojurescript setlocal commentstring=;\ %s
+    au FileType puppet setlocal commentstring=#\ %s
 augroup END
 
 " }}}
diff -r 7004f9ab85b4 -r 119223f86582 zsh/vagrant.zsh
--- a/zsh/vagrant.zsh	Tue May 01 11:06:18 2012 -0400
+++ b/zsh/vagrant.zsh	Tue May 08 11:05:57 2012 -0400
@@ -1,5 +1,6 @@
 alias v='vagrant'
 alias vs='vagrant suspend'
+alias vp='vagrant provision'
 alias vu='vagrant up'
 alias vh='vagrant halt'
 alias vss='vagrant ssh'