oh-my-zsh update, alias for compass watch

gitconfig

@@ -42,3 +42,9 @@
   lo = log --graph --decorate --pretty=oneline --abbrev-commit --all
   type = cat-file -t
   dump = cat-file -p
+[difftool "sourcetree"]
+	cmd = opendiff \"$LOCAL\" \"$REMOTE\"
+	path = 
+[mergetool "sourcetree"]
+	cmd = /Applications/SourceTree.app/Contents/Resources/opendiff-w.sh \"$LOCAL\" \"$REMOTE\" -ancestor \"$BASE\" -merge \"$MERGED\"
+	trustExitCode = true

oh-my-zsh

@@ -1 +1 @@
-Subproject commit 7d4e41ffcf0e89e9248ef5b4c21f392ecd957cbf
+Subproject commit b2748f6150a650b67ab4f07f554f117f0f10a892

vim/bundle/syntastic

@@ -1 +1 @@
-Subproject commit 65091e5dc8006f252146390622b0e567f50346bd
+Subproject commit f0123971f1c384533cbb83a7e2341210eeaf7265

zshrc

@@ -60,6 +60,9 @@ alias status='dandelion status'
 # grunt
 alias grw='grunt watch'
 alias grd='grunt deploy'
+
+# other tools
+alias cw='compass watch'
  
 # default plugins to load
 plugins=(brew git npm node gem osx)