Tweaks; add tmux conf

.gitconfig

@@ -1,9 +1,24 @@
 [user]
   name = Michael Campagnaro
   email = mikecampo@gmail.com
-[diff]
+[merge]
+  summary = true
 [color]
-  ui = auto
+  diff = auto
+  status = auto
+  branch = auto
+  interactive = auto
+  ui = true
+  pager = true
+[color "branch"]
+  current = yellow reverse
+  local   = yellow
+  remote  = green
+[color "diff"]
+  meta = blue
+  frag = magenta
+  old  = red
+  new  = green
 [alias]
   b = branch
   h = !git head
@@ -16,13 +31,15 @@
   sp = stash pop
   sd = stash drop
   sa = stash apply
-  st = status
+  st = status -s -b
   ci = commit
   cp = cherry-pick
   co = checkout
+  d   = diff
   dc = diff --cached
-  di = diff
-  amend = commit --amend
+  ds  = diff --staged
+  dw  = diff --color-words
+  ae = commit --amend
   aa = add --all
   head = !git l -1
   hp = "!source ~/.githelpers && show_git_head"