diff --git a/git/gitconfig.symlink b/git/gitconfig.symlink
index 0d732d8..07a9e0c 100644
--- a/git/gitconfig.symlink
+++ b/git/gitconfig.symlink
@@ -10,11 +10,12 @@
 [merge]
 	tool = bc3
 [init]
-	templatedir = /home/vagrant/.git_template
+
 [alias]
 	tree = log --oneline --decorate --all --graph
 	pulls = !git pull && git submodule init && git submodule update && git submodule status
 	psup = !git pull && git submodule update --init --recursive && git submodule status
+    unadd = reset HEAD
 [status]
 	submodulesummary = true
 [push]

diff --git a/git/gitconfig.symlink b/git/gitconfig.symlink
index 0d732d8..07a9e0c 100644
--- a/git/gitconfig.symlink
+++ b/git/gitconfig.symlink
@@ -10,11 +10,12 @@
 [merge]
 	tool = bc3
 [init]
-	templatedir = /home/vagrant/.git_template
+
 [alias]
 	tree = log --oneline --decorate --all --graph
 	pulls = !git pull && git submodule init && git submodule update && git submodule status
 	psup = !git pull && git submodule update --init --recursive && git submodule status
+    unadd = reset HEAD
 [status]
 	submodulesummary = true
 [push]
diff --git a/zsh/aliases.zsh b/zsh/aliases.zsh
index 30b78da..56389a4 100644
--- a/zsh/aliases.zsh
+++ b/zsh/aliases.zsh
@@ -24,10 +24,6 @@
 alias nano='nano -m'
 alias emacs='emacs -nw'
 
-alias ip="dig +short myip.opendns.com @resolver1.opendns.com"
-alias localip="ipconfig getifaddr en0"
-alias ips="ifconfig -a | perl -nle'/(\d+\.\d+\.\d+\.\d+)/ && print $1'"
-
 alias pushrefs='git push origin HEAD:refs/for/master'
 alias clangf='clang-format-3.7 -i'
 alias scala="scala -Dscala.color=true"

diff --git a/git/gitconfig.symlink b/git/gitconfig.symlink
index 0d732d8..07a9e0c 100644
--- a/git/gitconfig.symlink
+++ b/git/gitconfig.symlink
@@ -10,11 +10,12 @@
 [merge]
 	tool = bc3
 [init]
-	templatedir = /home/vagrant/.git_template
+
 [alias]
 	tree = log --oneline --decorate --all --graph
 	pulls = !git pull && git submodule init && git submodule update && git submodule status
 	psup = !git pull && git submodule update --init --recursive && git submodule status
+    unadd = reset HEAD
 [status]
 	submodulesummary = true
 [push]
diff --git a/zsh/aliases.zsh b/zsh/aliases.zsh
index 30b78da..56389a4 100644
--- a/zsh/aliases.zsh
+++ b/zsh/aliases.zsh
@@ -24,10 +24,6 @@
 alias nano='nano -m'
 alias emacs='emacs -nw'
 
-alias ip="dig +short myip.opendns.com @resolver1.opendns.com"
-alias localip="ipconfig getifaddr en0"
-alias ips="ifconfig -a | perl -nle'/(\d+\.\d+\.\d+\.\d+)/ && print $1'"
-
 alias pushrefs='git push origin HEAD:refs/for/master'
 alias clangf='clang-format-3.7 -i'
 alias scala="scala -Dscala.color=true"
diff --git a/zsh/zshrc.symlink b/zsh/zshrc.symlink
index e456514..2d69f25 100644
--- a/zsh/zshrc.symlink
+++ b/zsh/zshrc.symlink
@@ -86,3 +86,6 @@
 
 source /usr/share/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh
 ZSH_HIGHLIGHT_HIGHLIGHTERS=(main brackets cursor)
+
+# Disable "Software Flow Control (XON/XOFF)" so that terminal will not hang on C-s
+stty -ixon