Fixing merge conflicts and stuff

vim/.vim/.netrwhist

@@ -6,3 +6,4 @@ let g:netrw_dirhist_3='/home/jon'
 let g:netrw_dirhist_4='/home/jon/dwm-6.1/.git'
 let g:netrw_dirhist_5='/etc/X11/xorg.conf.d'
 let g:netrw_dirhist_6='/home/jon/projects/asciidoc/template'
+let g:netrw_dirhist_7='/home/jon/projects/contract_management/app'

vim/.vimrc

@@ -44,8 +44,6 @@ nnoremap <silent><expr> <Leader>h (&hls && v:hlsearch ? ':nohls' : ':set hls')."
 set showmatch
 set matchtime=2
 
-" python-syntax
-let pythong_highlight_all = 1
 syntax on
 
 set foldmethod=indent
@@ -79,11 +77,7 @@ nnoremap <S-Tab> :bprev<CR>
 
 nnoremap <space> za
 
-" NERDTree, open/close toggle
-" map <C-n> :NERDTreeToggle<CR>
-
 map <C-n> :NnnPicker<CR>
-
 " Opens the nnn window in a split
 let g:nnn#layout = { 'left': '~30%' } " or right, up, down
 
@@ -97,17 +91,14 @@ call plug#begin('~/.vim/plugged') " vim-plug
 
 Plug 'VundleVim/Vundle.vim'
 Plug 'tpope/vim-fugitive'
-"Plug 'scrooloose/nerdtree'
 Plug 'tmhedberg/SimpylFold'
 Plug 'vim-scripts/indentpython.vim'
 Plug 'scrooloose/syntastic'
 Plug 'nvie/vim-flake8'    " PEP 8 checking plugin
 Plug 'itchyny/lightline.vim'
 Plug 'taohexxx/lightline-buffer'
-"Plug 'klen/python-mode'
 Plug 'davidhalter/jedi-vim'
 Plug 'tpope/vim-surround'
-"Plug 'ap/vim-buftabline'
 Plug 'wellle/targets.vim'
 Plug 'junegunn/goyo.vim'
 Plug 'junegunn/fzf.vim'