diff --git a/tmux.conf b/tmux.conf
index 118613a..65c8824 100644
--- a/tmux.conf
+++ b/tmux.conf
@@ -3,14 +3,15 @@ set-option -g default-shell $SHELL
 
 set-option -g default-command "reattach-to-user-namespace -l zsh"
 
-set -g default-terminal "xterm"
+set -g default-terminal "screen-256color"
 
 # shorten command delay
 set -sg escape-time 1
+set -g history-limit 100000
 
 # act like GNU screen
-unbind C-b
-set -g prefix C-a
+# unbind C-b
+# set -g prefix C-a
 
 # a mouse
 set -g mode-mouse on
@@ -38,6 +39,7 @@ bind-key -r C-l select-window -t :+
 unbind [
 bind ` copy-mode
 unbind p
+bind -n C-k clear-history
 
 bind p paste-buffer
 bind -t vi-copy v begin-selection
@@ -51,7 +53,7 @@ bind y run "tmux save-buffer - | reattach-to-user-namespace pbcopy"
 # ----------------------
 # set pane colors - hilight the active pane
 set-option -g pane-border-fg colour15 #base02
-set-option -g pane-active-border-fg colour15 #base01
+set-option -g pane-active-border-fg colour23 #base01
 
 # colorize messages in the command line
 set-option -g message-bg black #base02
@@ -70,10 +72,16 @@ set -g visual-activity on
 
 # set color for status bar
 set-option -g status-bg default #base02
-set-option -g status-fg white
+set-option -g status-fg colour5
 set-option -g status-attr dim
 
 # show session name, window & pane number,
 # date and time on right side of status bar
 set -g status-right-length 60
-set -g status-right "#[fg=color235]#S #I:#P #[fg=color235]:: %d %b %Y #[fg=color235]:: %l:%M %p :: #(date -u | awk '{print $4}')::"
+set -g status-left "#[fg=colour39][#S]"
+set -g status-right "#[fg=colour39]%d %b %Y  ::  %l:%M %p  "
+set -g window-status-format "#[fg=white,bg=default] #I #W "
+set -g window-status-current-format "#[fg=colour17,bg=colour39,noreverse] #I #W "
+
+# scrolling
+set -g terminal-overrides 'xterm*:smcup@:rmcup@'
diff --git a/vimrc b/vimrc
index 4b9ae60..fb81b6f 100644
--- a/vimrc
+++ b/vimrc
@@ -17,11 +17,15 @@ Plugin 'scrooloose/nerdtree'
 Plugin 'mileszs/ack.vim'
 Plugin 'altercation/vim-colors-solarized'
 Plugin 'L9'
+Plugin 'vim-scripts/gitignore'
+Plugin 'fatih/vim-go'
 Plugin 'rking/ag.vim'
 Bundle 'flazz/vim-colorschemes'
 Bundle 'bling/vim-airline'
 Bundle 'derekwyatt/vim-scala'
 Plugin 'tpope/vim-rsi'
+Bundle 'uarun/vim-protobuf'
+Plugin 'majutsushi/tagbar'
 
 " All of your Plugins must be added before the following line
 call vundle#end()            " required
@@ -70,6 +74,43 @@ nnoremap <Leader>e :wq<CR>
 nnoremap <CR> G
 nnoremap <BS> gg
 
+"GOLANG STUFF BELOW
+map <C-t> :TagbarToggle<CR>
+let g:tagbar_type_go = {  
+    \ 'ctagstype' : 'go',
+    \ 'kinds'     : [
+        \ 'p:package',
+        \ 'i:imports:1',
+        \ 'c:constants',
+        \ 'v:variables',
+        \ 't:types',
+        \ 'n:interfaces',
+        \ 'w:fields',
+        \ 'e:embedded',
+        \ 'm:methods',
+        \ 'r:constructor',
+        \ 'f:functions'
+    \ ],
+    \ 'sro' : '.',
+    \ 'kind2scope' : {
+        \ 't' : 'ctype',
+        \ 'n' : 'ntype'
+    \ },
+    \ 'scope2kind' : {
+        \ 'ctype' : 't',
+        \ 'ntype' : 'n'
+    \ },
+    \ 'ctagsbin'  : 'gotags',
+    \ 'ctagsargs' : '-sort -silent'
+\ }
+let g:go_fmt_command = "goimports"
+let g:go_fmt_autosave = 1
+let g:go_highlight_functions = 1
+let g:go_highlight_methods = 1
+let g:go_highlight_structs = 1
+let g:go_highlight_operators = 1
+let g:go_highlight_build_constraints = 1
+
 " vp doesn't replace paste buffer
 function! RestoreRegister()
   let @" = s:restore_reg
diff --git a/zshrc-stuff b/zshrc-stuff
index e069d3c..177a131 100644
--- a/zshrc-stuff
+++ b/zshrc-stuff
@@ -17,8 +17,16 @@ alias caba="cd ~/Projects/carebear"
 alias hot="cd ~/Projects/hoteru"
 alias be="bundle exec"
 
+# tmux alias
+alias tmux="TERM=screen-256color-bce tmux"
+alias ta="tmux a -t"
+alias tn="tmux new -s"
+
+export EDITOR='vim'
 export LANG=en_US.UTF-8
 export LC_ALL=en_US.UTF-8
+export CC=/usr/bin/gcc
+export GOPATH=$HOME/go
 export PATH="/Users/admin/.rvm/gems/ruby-2.0.0-p451/bin:/Users/admin/.rvm/gems/ruby-2.0.0-p451@global/bin:/Users/admin/.rvm/rubies/ruby-2.0.0-p451/bin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin:/Users/admin/.rvm/bin"
 
 # Opens the github page for the current git repository in your browser