diff --git a/.emacs.d/Cask b/.emacs.d/Cask
index 21007f4..fa45c59 100644
--- a/.emacs.d/Cask
+++ b/.emacs.d/Cask
@@ -14,14 +14,19 @@
 (depends-on "elpy")
 (depends-on "epc")
 (depends-on "evil")
+(depends-on "evil-leader")
 (depends-on "exec-path-from-shell")
 (depends-on "flx-ido")
 (depends-on "flycheck")
 (depends-on "go-autocomplete")
 (depends-on "go-mode")
+(depends-on "grizzl")
 (depends-on "jedi")
+(depends-on "key-chord")
 (depends-on "magit")
+(depends-on "neotree")
 (depends-on "pallet")
 (depends-on "projectile")
+(depends-on "tabbar")
 (depends-on "yasnippet")
-(depends-on "zenburn-theme")
\ No newline at end of file
+(depends-on "zenburn-theme")
diff --git a/.emacs.d/init.el b/.emacs.d/init.el
index 05c6a69..8998a39 100644
--- a/.emacs.d/init.el
+++ b/.emacs.d/init.el
@@ -53,6 +53,9 @@
   (exec-path-from-shell-initialize))
 
 ;; Evil!
+(require 'evil-leader)
+(global-evil-leader-mode)
+(evil-leader/set-leader ",")
 (require 'evil)
 (evil-mode 1)
 (setq evil-default-cursor t) 
@@ -69,6 +72,7 @@
 
 ;; flx-ido completion system, recommended by Projectile
 (require 'flx-ido)
+(require 'grizzl)
 (flx-ido-mode 1)
 ;; change it if you have a fast processor.
 (setq flx-ido-threshhold 1000)
@@ -76,6 +80,7 @@
 ;; Project management
 (require 'ack-and-a-half)
 (require 'projectile)
+(setq projectile-completion-system 'grizzl)
 (projectile-global-mode)
 
 ; Autocomplete
@@ -106,8 +111,23 @@
 (require 'neotree)
 (menu-bar-mode -1)
 
+(require 'key-chord)
+(require 'tabbar)
 ;; Evil Key Defines
 (define-key evil-normal-state-map "gc" 'kill-buffer-and-window)
+(define-key evil-normal-state-map "gn" 'tabbar-forward-tab)
+(define-key evil-normal-state-map "gp" 'tabbar-backward-tab)
+(define-key evil-normal-state-map (kbd "C-e") 'move-end-of-line)
+(define-key evil-normal-state-map (kbd "C-a") 'move-beginning-of-line)
+(define-key evil-insert-state-map (kbd "C-e") 'move-end-of-line)
+(define-key evil-insert-state-map (kbd "C-a") 'move-beginning-of-line)
+;(setq key-chord-two-keys-delay 0.5)
+(key-chord-define evil-insert-state-map "jj" 'evil-normal-state)
+(key-chord-mode 1)
+(evil-leader/set-key 
+  "o" 'projectile-switch-to-buffer
+  "t" 'projectile-find-file
+)
 
 (load-theme 'barak t)
 
diff --git a/.tmux.conf b/.tmux.conf
index 8eba866..f51a60a 100644
--- a/.tmux.conf
+++ b/.tmux.conf
@@ -5,8 +5,8 @@ bind-key C-a select-pane -t :.+
 bind-key a send-prefix
 bind-key j select-pane -D
 bind-key k select-pane -U
-#bind-key h select-pane -L
-#bind-key l select-pane -R
+bind-key h select-pane -L
+bind-key l select-pane -R
 bind-key C-n next-window
 bind-key C-p previous-window
 set -g set-titles off
diff --git a/.vim/filetype.vim b/.vim/filetype.vim
index 5269fb1..28530e1 100644
--- a/.vim/filetype.vim
+++ b/.vim/filetype.vim
@@ -29,14 +29,15 @@ augroup END
 
 au! BufNewFile,BufRead *.pde setf arduino
 
-"augroup org
-  "" leave these as is:
-  "au! BufRead,BufWrite,BufWritePost,BufNewFile *.org 
-  "au BufRead,BufNewFile *.org            call org#SetOrgFileType()
-  "au BufRead *.org :PreLoadTags
-  "au BufWrite *.org :PreWriteTags
-  "au BufWritePost *.org :PostWriteTags
-"augroup END
+augroup org
+  " leave these as is:
+  au! BufRead,BufWrite,BufWritePost,BufNewFile *.org 
+  au BufRead,BufNewFile *.org            call org#SetOrgFileType()
+  au BufRead,BufNewFile *.org            :GitGutterDisable
+  au BufRead *.org :PreLoadTags
+  au BufWrite *.org :PreWriteTags
+  au BufWritePost *.org :PostWriteTags
+augroup END
 
 au BufNewFile,BufRead motd.public,/tmp/motd.public.r.* setf motd
 
diff --git a/.vimrc b/.vimrc
index bce6364..6dd9fd1 100644
--- a/.vimrc
+++ b/.vimrc
@@ -24,6 +24,7 @@ set expandtab
 " I like comma instead of slash, but that probably comes from playing
 " Nethack and Angband
 let mapleader = ","
+let maplocalleader = "\\"
 
 " Set 'smart' things in Vim
 " Search case insensitive, unless it contains Uppercase letters
@@ -78,10 +79,14 @@ autocmd InsertLeave * if pumvisible() == 0|pclose|endif
 set rtp+=~/.vim/bundle/Vundle.vim
 call vundle#begin()
 
+Plugin 'gmarik/Vundle.vim'
+Plugin 'conque_2.3'
+Plugin 'eclim'
 Plugin 'vim-scripts/DrawIt'
+Plugin 'tpope/vim-speeddating'
 Plugin 'vim-scripts/EasyGrep'
 Plugin 'chrisbra/NrrwRgn'
-Plugin 'jceb/vim-orgmode'
+Plugin 'hsitz/VimOrganizer'
 Plugin 'mileszs/ack.vim'
 Plugin 'mattn/calendar-vim'
 Plugin 'vim-scripts/fish-syntax'
@@ -129,13 +134,13 @@ autocmd FileType python set tags+=$HOME/.vim/tags/python.ctags
 "autocmd FileType python call SuperTabSetCompletionType("<C-X><C-O>")
 
 " Set filetype for VimOrganizer
-"au! BufRead,BufWrite,BufWritePost,BufNewFile *.org 
-"au BufEnter *.org            call org#SetOrgFileType()
+au! BufRead,BufWrite,BufWritePost,BufNewFile *.org 
+au BufEnter *.org            call org#SetOrgFileType()
 
 "au! BufRead,BufWrite,BufWritePost,BufNewFile *.org
 "au BufEnter *.org call org#SetOrgFileType()
-"command! OrgCapture :call org#CaptureBuffer()
-"command! OrgCaptureFile :call org#OpenCaptureFile()
+command! OrgCapture :call org#CaptureBuffer()
+command! OrgCaptureFile :call org#OpenCaptureFile()
 
 " Cull trailing whitespace for all files.
 autocmd BufWritePre * :call AutoTrimWhitespace()
@@ -166,6 +171,11 @@ let g:UseGooglePythonSettings = 0
 " * Eclim
 let g:EclimCompletionMethod = 'omnifunc'
 
+" * Syntastic
+let g:syntastic_python_flake8_args='--ignore=E111'
+let g:syntastic_go_checkers=['go', 'govet', 'golintc']
+" E111 = Spaces should be multiples of 4. I use 2.
+
 " * Configure browser for haskell_doc.vim
 let g:haddock_browser = "open"
 let g:haddock_browser_callformat = "%s %s"
diff --git a/bin/golintc b/bin/golintc
new file mode 100755
index 0000000..1efa0a1
--- /dev/null
+++ b/bin/golintc
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+golint "$@" | grep -v "should have comment or be unexported"