diff --git a/bash_aliases b/bash_aliases
index 42744b0..8750325 100644
--- a/bash_aliases
+++ b/bash_aliases
@@ -6,6 +6,7 @@ alias adocs='cd $ADDGENE_CORE_REPO_DIR/docs && make html && open $ADDGENE_CORE_R
 alias aenv='env | sort | grep ADDGENE'
 alias ag='\ag --pager="less"'
 alias cg='cd "$(git rev-parse --show-toplevel)"'
+alias ctags="`brew --prefix`/bin/ctags"
 alias dots="cd $(dirname `readlink ~/.vim`)"
 alias g='git'
 alias gp='git push'
diff --git a/emacs b/emacs
index 9a15ff4..110fad6 100644
--- a/emacs
+++ b/emacs
@@ -5,7 +5,7 @@
 (add-to-list 'package-archives '("melpa-stable" . "http://stable.melpa.org/packages/"))
 
 (setq package-enable-at-startup nil)
-(setq sml/theme 'dark)
+(setq sml/theme 'light)
 (package-initialize)
 (custom-set-variables
  ;; custom-set-variables was added by Custom.
@@ -25,6 +25,11 @@
  ;; Your init file should contain only one such instance.
  ;; If there is more than one, they won't work right.
  )
+
+;; Git interface
+(use-package magit)
+
+;; VIM IN EMACS
 (use-package evil
   :ensure t
   :config
@@ -32,16 +37,33 @@
   ;; More configuration goes here
   )
 
+; Solariazed Configurations
+(load-theme 'solarized t)
+(set-terminal-parameter nil 'background-mode 'dark)
+(add-hook 'after-make-frame-functions
+          (lambda (frame)
+            (let ((mode (if (display-graphic-p frame) 'light 'dark)))
+              (set-frame-parameter frame 'background-mode mode)
+              (set-terminal-parameter frame 'background-mode mode))
+            (enable-theme 'solarized)))
+
+; Mode Line configurations to make powerliner better
 (use-package smart-mode-line
   :ensure t
   :config
   (sml/setup)
-)
+
+;; Powerline
 (use-package powerline
   :ensure t
   :config
   (powerline-center-evil-theme)
 )
+;; Set Powerline Configuration
+(setq powerline-arrow-shape 'curve)
+(setq powerline-default-separator-dir '(right . left))
+)
+
 ; https://www.emacswiki.org/emacs/NeoTree
 (use-package neotree
   :ensure t
@@ -49,6 +71,7 @@
   (global-set-key [f8] 'neotree-toggle)
   (setq neo-smart-open t)
 )
+<<<<<<< HEAD
 ;; Set Powerline Configuration
 (setq powerline-arrow-shape 'curve)
 (setq powerline-default-separator-dir '(right . left))
@@ -57,11 +80,33 @@
 (add-hook 'python-mode-hook 'projectile-mode)
 
 ;; rebind neotree in evil-mode
+=======
+>>>>>>> 0c4d4a216c50c05346f138e4c5e8e73ac8f4c81a
 (evil-define-key 'normal neotree-mode-map (kbd "TAB") 'neotree-enter)
 (evil-define-key 'normal neotree-mode-map (kbd "SPC") 'neotree-enter)
 (evil-define-key 'normal neotree-mode-map (kbd "q") 'neotree-hide)
 (evil-define-key 'normal neotree-mode-map (kbd "RET") 'neotree-enter)
 
+;; Jedi - Python autocomplete
+(add-hook 'python-mode-hook 'jedi:setup)
+(setq jedi:complete-on-dot t)  
+(add-hook 'python-mode-hook 'jedi:setup)
+
+;; Virtualenv stuff
+;; https://github.com/porterjamesj/virtualenvwrapper.el
+(require 'virtualenvwrapper)
+(venv-initialize-interactive-shells) ;; if you want interactive shell support
+(venv-initialize-eshell) ;; if you want eshell support
+
+;; Projectile and Virtualenv
+(setq projectile-switch-project-action 'venv-projectile-auto-workon)
+(setq venv-dirlookup-names '(".venv" "pyenv" ".virtual"))
+
+;; keybindings
+;; Magit!
+(global-set-key (kbd "C-x g") 'magit-status)
+;; buffer list
+(global-set-key (kbd "C-x C-l") 'list-buffers)
 (set-terminal-parameter nil 'background-mode 'dark)
 (add-hook 'after-make-frame-functions
           (lambda (frame)
diff --git a/vimrc b/vimrc
index 7ae2c9c..e1f615b 100644
--- a/vimrc
+++ b/vimrc
@@ -114,6 +114,10 @@ nmap <leader>bb :CtrlPBuffer<cr>
 nmap <leader>bm :CtrlPMixed<cr>
 nmap <leader>bs :CtrlPMRU<cr>
 
+" Tagbar
+nmap <F8> :TagbarToggle<CR>
+nmap <F7> :CtrlPTag<CR>
+
 
 " To open a new empty buffer
 " This replaces :tabnew which I used to bind to this mapping
@@ -148,3 +152,7 @@ let vim_markdown_preview_browser='Google Chrome'
 if filereadable($HOME . "/.vimrc.local")
   source ~/.vimrc.local
 endif
+
+" Set the ctags file name
+set tags=./tags;
+let g:tagbar_ctags_bin='/usr/local/bin/ctags'
diff --git a/zpreztorc b/zpreztorc
index 3d29533..58686ff 100644
--- a/zpreztorc
+++ b/zpreztorc
@@ -9,7 +9,6 @@ zstyle ':prezto:load' pmodule \
   'completion' \
   'tmux' \
   'git' \
-  'python' \
   'prompt'
 
 zstyle ':prezto:module:autosuggestions:color' found ''