this & that

brew

@@ -10,6 +10,7 @@ brew update
 brew upgrade
 
 # Install what we need
+brew install bash
 brew install bash-completion
 brew install git
 brew install node

gitconfig

@@ -43,6 +43,12 @@
 	# a.k.a. ‘delete merged’
 	dm = "!git branch --merged | grep -v '\\*' | xargs -n 1 git branch -d"
 
+[fetch]
+    prune = true
+
+[push]
+	default = matching
+
 [color]
 	diff = auto
 	status = auto
@@ -63,19 +69,17 @@
 	changed = yellow bold
 	untracked = red
 
-[push]
+# Set Kaleidoscope as diff and merge tool
-	default = matching
-
-[difftool "Kaleidoscope"]
-    cmd = ksdiff --partial-changeset --relative-path \"$MERGED\" -- \"$LOCAL\" \"$REMOTE\"
 [diff]
     tool = Kaleidoscope
 [difftool]
     prompt = false
-[mergetool "Kaleidoscope"]
+[difftool "Kaleidoscope"]
-    cmd = ksdiff --merge --output \"$MERGED\" --base \"$BASE\" -- \"$LOCAL\" --snapshot \"$REMOTE\" --snapshot
+    cmd = ksdiff --partial-changeset --relative-path \"$MERGED\" -- \"$LOCAL\" \"$REMOTE\"
-    trustExitCode = true
+[merge]
+    tool = Kaleidoscope
 [mergetool]
     prompt = false
-[merge]
+[mergetool "Kaleidoscope"]
-    tool = Kaleidoscope
+    cmd = ksdiff --merge --output \"$MERGED\" --base \"$BASE\" -- \"$LOCAL\" --snapshot \"$REMOTE\" --snapshot
+    trustExitCode = true

npmrc

@@ -3,4 +3,6 @@
 #registry = http://registry.npmjs.eu
 
 # Make npm less noisy
+# If only it would work...
+# https://github.com/npm/npm/issues/4186
 loglevel = warn

ruby

@@ -4,8 +4,8 @@
 curl -sSL https://get.rvm.io | bash
 
 # Install a Ruby
-rvm install 2.1.0
+rvm install 2.1.1
-rvm use 2.1.0
+rvm use 2.1.1
 rvm rubygems latest
 
 # Install gems