diff --git a/.gitconfig b/.gitconfig
index ce02541..12a78d7 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -1,35 +1,37 @@
 [user]
-	name = Michael Campagnaro
-    email = mikecampo@gmail.com
+  name = Michael Campagnaro
+  email = mikecampo@gmail.com
 [diff]
 [color]
-    ui = auto
+  ui = auto
 [alias]
-    st = status
-    ci = commit
-    co = checkout
-    di = diff
-    dc = diff --cached
-    amend = commit --amend
-    aa = add --all
-    head = !git l -1
-    h = !git head
-    hp = "!source ~/.githelpers && show_git_head"
-    r = !git l -20
-    ra = !git r --all
-    ff = merge --ff-only
-    pullff = pull --ff-only
-    noff = merge --no-ff
-    l = "!source ~/.githelpers && pretty_git_log"
-    la = !git l --all
-    div = divergence
-    gn = goodness
-    gnc = goodness --cached
-    fa = fetch --all
-    pom = push origin master
-    b = branch
-    ds = diff --stat=160,120
-    dh1 = diff HEAD~1
+  p = push
+  st = status
+  ci = commit
+  co = checkout
+  di = diff
+  dc = diff --cached
+  amend = commit --amend
+  aa = add --all
+  head = !git l -1
+  h = !git head
+  hp = "!source ~/.githelpers && show_git_head"
+  r = !git l -20
+  re = remote
+  ra = !git r --all
+  ff = merge --ff-only
+  pullff = pull --ff-only
+  noff = merge --no-ff
+  l = "!source ~/.githelpers && pretty_git_log"
+  la = !git l --all
+  div = divergence
+  gn = goodness
+  gnc = goodness --cached
+  fa = fetch --all
+  pom = push origin master
+  b = branch
+  ds = diff --stat=160,120
+  dh1 = diff HEAD~1
 
 [merge]
-    tool = vimdiff
+  tool = vimdiff
diff --git a/.zshrc b/.zshrc
index b8e9541..8519774 100644
--- a/.zshrc
+++ b/.zshrc
@@ -31,7 +31,7 @@ alias ls='ls -G'
 alias ll='ls -lG'
 alias l='ls -laG'
 alias duh='du -csh'
-export GREP_OPTIONS="--color"
+export GREP_OPTIONS="-n --color"
 
 # Unbreak history
 export HISTSIZE=10000
@@ -43,12 +43,14 @@ alias r=rails
 alias g=git
 alias gst='git st'
 alias gci='git ci'
+alias gp='git push'
 alias gpom='git push origin master'
 alias gf='git fetch'
 alias gaa='git add --all'
-alias gl='!source ~/.githelpers && pretty_git_log'
+alias gl="!source ~/.githelpers && pretty_git_log"
 alias gdc='git diff --cached'
 alias gam='git commit --amend'
+alias gre='git remote'
 alias cls=clear
 alias sl=ls # often screw this up
 alias history='fc -l 1'