diff --git a/includes/bash_aliases.bash b/includes/bash_aliases.bash
index 1a9426d..a49cdae 100644
--- a/includes/bash_aliases.bash
+++ b/includes/bash_aliases.bash
@@ -20,6 +20,12 @@ alias gh="github"
 alias +x="chmod +x"
 alias x+="chmod +x"
 
+# Git
+alias gs="git status"
+alias gd="git diff"
+alias gds="git diff --staged"
+alias gc="git commit -sv"
+
 # Detect which `ls` flavor is in use
 if ls --color > /dev/null 2>&1; then  # GNU `ls`
 	colorflag="--color"
@@ -96,10 +102,6 @@ alias sayit="pbpaste | say"
 alias npm-patch='npm version patch -m "%s"'
 alias npm-release='npm version minor -m "%s"'
 
-# Grunt
-alias gw="grunt watch --debug"
-alias gs="grunt connect watch --debug"
-
 # Tâmia
 tm() { yo tamia:$@; }
 
diff --git a/tilde/gitconfig b/tilde/gitconfig
index aad48c5..bfc3656 100644
--- a/tilde/gitconfig
+++ b/tilde/gitconfig
@@ -6,7 +6,7 @@
 	old = red bold
 	new = green bold
 [core]
-	editor = nano
+	editor = vim
 	# http://stackoverflow.com/questions/136178/git-diff-handling-long-lines
 	# If doesn't work, try: pager = less -+$LESS -FRX
 	pager = less -r
@@ -34,8 +34,8 @@
 
 # Any GitHub repo with my username should be checked out r/w by default
 # http://rentzsch.tumblr.com/post/564806957/public-but-hackable-git-submodules
-[url "git@github.com:sapegin/"]
-	insteadOf = "git://github.com/sapegin/"
+[url "git@github.com:jacobkiers/"]
+	insteadOf = "git://github.com/jacobkiers/"
 
 # URL shorthands
 [url "git@github.com:"]
@@ -64,7 +64,7 @@
 
 # Include local settings
 # Requires Git 1.7.10
-# git config -f ~/.gitlocal user.email "artem@sapegin.ru"
-# git config -f ~/.gitlocal user.name "Artem Sapegin"
+# git config -f ~/.gitlocal user.email "jacob@jacobkiers.net"
+# git config -f ~/.gitlocal user.name "Jacob Kiers"
 [include]
 	path = .gitlocal