diff --git a/git/gitconfig.symlink b/git/gitconfig.symlink
index 83d8705..15ed8cb 100644
--- a/git/gitconfig.symlink
+++ b/git/gitconfig.symlink
@@ -8,10 +8,15 @@
 	trustExitCode = true
 [user]
 	name = Marcus Bengtsson
-	email = marcus.bengtsson@hiq.se
+	email = marcus.bengtsson@cactusrail.se
 [diff]
 	tool = kdiff3
 [difftool]
 	prompt = false
 [merge]
 	tool = kdiff3
+[init]
+	templatedir = ~/.git_template
+[alias]
+	tree = log --oneline --decorate --all --graph
+	pulls = !git pull && git submodule init && git submodule update && git submodule status

diff --git a/git/gitconfig.symlink b/git/gitconfig.symlink
index 83d8705..15ed8cb 100644
--- a/git/gitconfig.symlink
+++ b/git/gitconfig.symlink
@@ -8,10 +8,15 @@
 	trustExitCode = true
 [user]
 	name = Marcus Bengtsson
-	email = marcus.bengtsson@hiq.se
+	email = marcus.bengtsson@cactusrail.se
 [diff]
 	tool = kdiff3
 [difftool]
 	prompt = false
 [merge]
 	tool = kdiff3
+[init]
+	templatedir = ~/.git_template
+[alias]
+	tree = log --oneline --decorate --all --graph
+	pulls = !git pull && git submodule init && git submodule update && git submodule status
diff --git a/vim/vimrc.symlink b/vim/vimrc.symlink
index b9e2b1e..36840b4 100644
--- a/vim/vimrc.symlink
+++ b/vim/vimrc.symlink
@@ -11,7 +11,7 @@
 let g:airline_powerline_fonts = 1
 
 " Fonts and encoding
-set guifont=Inconsolata\ for\ Powerline\ 14   " set font
+set guifont=Inconsolata\ for\ Powerline\ 12   " set font
 set encoding=utf8                             " set encoding to utf8
 
 " Tabs-stop

diff --git a/git/gitconfig.symlink b/git/gitconfig.symlink
index 83d8705..15ed8cb 100644
--- a/git/gitconfig.symlink
+++ b/git/gitconfig.symlink
@@ -8,10 +8,15 @@
 	trustExitCode = true
 [user]
 	name = Marcus Bengtsson
-	email = marcus.bengtsson@hiq.se
+	email = marcus.bengtsson@cactusrail.se
 [diff]
 	tool = kdiff3
 [difftool]
 	prompt = false
 [merge]
 	tool = kdiff3
+[init]
+	templatedir = ~/.git_template
+[alias]
+	tree = log --oneline --decorate --all --graph
+	pulls = !git pull && git submodule init && git submodule update && git submodule status
diff --git a/vim/vimrc.symlink b/vim/vimrc.symlink
index b9e2b1e..36840b4 100644
--- a/vim/vimrc.symlink
+++ b/vim/vimrc.symlink
@@ -11,7 +11,7 @@
 let g:airline_powerline_fonts = 1
 
 " Fonts and encoding
-set guifont=Inconsolata\ for\ Powerline\ 14   " set font
+set guifont=Inconsolata\ for\ Powerline\ 12   " set font
 set encoding=utf8                             " set encoding to utf8
 
 " Tabs-stop
diff --git a/zsh/aliases.zsh b/zsh/aliases.zsh
index 54fa020..7d58cc0 100644
--- a/zsh/aliases.zsh
+++ b/zsh/aliases.zsh
@@ -22,9 +22,13 @@
 alias vimf='vim --remote-silent'
 alias pgrep='ps -eo "%p %c %U %C" | grep'
 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 elasticsearch=~/Development/elasticsearch-1.5.2/bin/elasticsearch
+
+alias pushrefs='git push origin HEAD:refs/for/master'
+alias clangf='clang-format-3.7 -i'

diff --git a/git/gitconfig.symlink b/git/gitconfig.symlink
index 83d8705..15ed8cb 100644
--- a/git/gitconfig.symlink
+++ b/git/gitconfig.symlink
@@ -8,10 +8,15 @@
 	trustExitCode = true
 [user]
 	name = Marcus Bengtsson
-	email = marcus.bengtsson@hiq.se
+	email = marcus.bengtsson@cactusrail.se
 [diff]
 	tool = kdiff3
 [difftool]
 	prompt = false
 [merge]
 	tool = kdiff3
+[init]
+	templatedir = ~/.git_template
+[alias]
+	tree = log --oneline --decorate --all --graph
+	pulls = !git pull && git submodule init && git submodule update && git submodule status
diff --git a/vim/vimrc.symlink b/vim/vimrc.symlink
index b9e2b1e..36840b4 100644
--- a/vim/vimrc.symlink
+++ b/vim/vimrc.symlink
@@ -11,7 +11,7 @@
 let g:airline_powerline_fonts = 1
 
 " Fonts and encoding
-set guifont=Inconsolata\ for\ Powerline\ 14   " set font
+set guifont=Inconsolata\ for\ Powerline\ 12   " set font
 set encoding=utf8                             " set encoding to utf8
 
 " Tabs-stop
diff --git a/zsh/aliases.zsh b/zsh/aliases.zsh
index 54fa020..7d58cc0 100644
--- a/zsh/aliases.zsh
+++ b/zsh/aliases.zsh
@@ -22,9 +22,13 @@
 alias vimf='vim --remote-silent'
 alias pgrep='ps -eo "%p %c %U %C" | grep'
 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 elasticsearch=~/Development/elasticsearch-1.5.2/bin/elasticsearch
+
+alias pushrefs='git push origin HEAD:refs/for/master'
+alias clangf='clang-format-3.7 -i'
diff --git a/zsh/prompt.zsh b/zsh/prompt.zsh
index 7678b62..dab3893 100644
--- a/zsh/prompt.zsh
+++ b/zsh/prompt.zsh
@@ -25,7 +25,7 @@
     zle reset-prompt
 }
 
-PROMPT_HOST='%{%F{yellow}%K{black}%} %n %{%F{black}%}'
+PROMPT_HOST='%{%F{yellow}%K{black}%} %? %n %{%F{black}%}'
 PROMPT_DIR='%{%F{black}%} %~%  '
 PROMPT_SU='%(!.%{%k%F{blue}%K{black}%}%{%F{yellow}%} ⚡ %{%k%F{black}%}.%{%k%F{blue}%})%{%f%k%b%}'