--- a/.hgsub Thu May 24 14:09:10 2012 -0400
+++ b/.hgsub Mon Jun 04 10:38:32 2012 -0400
@@ -4,6 +4,8 @@
vim/bundle/ack = [git]git://github.com/mileszs/ack.vim.git
vim/bundle/gundo = [hg]https://bitbucket.org/sjl/gundo.vim/
+vim/bundle/commaobject = [git]git://github.com/austintaylor/vim-commaobject.git
+vim/bundle/salt = [git]git://github.com/saltstack/salt-vim.git
vim/bundle/clam = [hg]https://bitbucket.org/sjl/clam.vim/
vim/bundle/html5 = [git]git://github.com/othree/html5.vim.git
vim/bundle/markdown = [git]git://github.com/tpope/vim-markdown.git
--- a/.hgsubstate Thu May 24 14:09:10 2012 -0400
+++ b/.hgsubstate Mon Jun 04 10:38:32 2012 -0400
@@ -3,12 +3,13 @@
4d95cb18a3b420154ef978c53de1d2e692f8343d mercurial/templates
d2bb7878622e4c16203acf1c92a0f4bc7ac58003 vim/bundle/AnsiEsc.vim
9895285042a2fd5691b2f6582aa979e4d1bdffea vim/bundle/ack
-0256648073658469f219c4f739da528d5325e215 vim/bundle/badwolf
-b528cf3de72884dd6cf5fdbeda375d7437ea811f vim/bundle/clam
+383c5a5e05232def8540aab9342527adc01fcfb8 vim/bundle/badwolf
+ed67c4908fa033eef6cdfacc8141750e99f1345b vim/bundle/clam
+0cb36de11bb12b5c8d92abb6d400dbb581b8f093 vim/bundle/commaobject
b1035a2c6d29a80ea7fd44077814d0bbfc9cdba7 vim/bundle/ctrlp
667a668e114e9ec0e5d4cbcb0962d835b23614c4 vim/bundle/easymotion
6515bd43acc28c86fcf3bea64ce8a6b3d7db19ff vim/bundle/fugitive
-43ea418b11f7f78aae0e60229548f68400fc89b8 vim/bundle/gundo
+8c570a493d260890242cbdc5a22d8500dc4604cb vim/bundle/gundo
9822fac5329dcd3100dbda89b58ba9160937060a vim/bundle/html5
78fffa609b3e6b84ef01ee4c9aba6d7435d7b18e vim/bundle/indent-object
9543eec44e5cb75b67f0e5eaf1377ca82ced7b90 vim/bundle/linediff
@@ -17,7 +18,8 @@
b7889db57c90824ff5092da4fdde9e05689f24fa vim/bundle/nosecompiler
b31111e14ceac0160a1703030fbbaae5656bee4c vim/bundle/powerline
a4b655398f878469bbbeec1b02f5b3bdc126414b vim/bundle/python-mode
-3a307dc6b725ebb053e75bad5968ca34366102ad vim/bundle/slimv
+fd7368d81bfb2ff88de3ab71b4aa6028ab401c3d vim/bundle/salt
+05bf07da7c2deb99fffba8903c740124a4e2b140 vim/bundle/slimv
78ab4b3df24fa2753d3dfc1be75ed5a3df1565b8 vim/bundle/smartinput
c6197a10ace82e0fe0c08e5cf5c017b7069a978e vim/bundle/sparkup
3a2ab096c039516a8f43e6acd0264d8a81cd0544 vim/bundle/splice
--- a/gitconfig Thu May 24 14:09:10 2012 -0400
+++ b/gitconfig Mon Jun 04 10:38:32 2012 -0400
@@ -10,6 +10,7 @@
[alias]
tags = tag -l
branches = branch -a
+ remotes = remote -v
l = log -16 --color=always --all --topo-order --pretty='format:%Cgreen%h%Creset %s%Cred%d%Creset %C(black bold)(by %an)%Creset'
ll = log --color=always --all --topo-order --pretty='format:%Cgreen%h%Creset %s%Cred%d%Creset %C(black bold)(by %an)%Creset'
gl = log -10 --color=always --all --graph --topo-order --pretty='format:%Cgreen%h%Creset %s %C(black bold)(by %an)%Creset%C(yellow bold)%d%Creset%n'
--- a/vim/custom-dictionary.utf-8.add Thu May 24 14:09:10 2012 -0400
+++ b/vim/custom-dictionary.utf-8.add Mon Jun 04 10:38:32 2012 -0400
@@ -28,3 +28,7 @@
IRC
diffs
codebase
+Clojurecraft
+Mojang
+Minecraft
+wiki