diff --git a/bootstrap.sh b/bootstrap.sh
index 1f985f9..faeff6f 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -120,6 +120,7 @@ dependencies () {
             aspell                            # Spelling
             bash                              # Updated shell
             bash-completion                   # Shell completion
+            black                             # Python formatter
             cabextract                        # .cab file extraction with Wine
             cmake                             # Compilation
             ctags                             #
diff --git a/environment b/environment
index 8b6ca29..7765271 100644
--- a/environment
+++ b/environment
@@ -10,7 +10,7 @@ export GIT_COMMITTER_NAME="D""a""v""i""d"" ""B""e""i""t""e""y"
 export GIT_COMMITTER_EMAIL="d""a""v""i""d""@""d""a""v""i""d""j""b"".""c""o""m"
 export GIT_AUTHOR_EMAIL="d""a""v""i""d""@""d""a""v""i""d""j""b"".""c""o""m"
 export PIP_DOWNLOAD_CACHE="$HOME/.pip/download-cache"
-export PATH="$PATH:/usr/local/bin:/usr/local/sbin:$HOME/dotfiles/tools/python/bin:$HOME/dotfiles/tools/nodejs/bin:$HOME/dotfiles/tools/nodejs/node_modules/.bin:$HOME/dotfiles/tools/ruby/bin"
+export PATH="/usr/local/bin:/usr/local/sbin:$HOME/dotfiles/tools/python/bin:$HOME/dotfiles/tools/nodejs/bin:$HOME/dotfiles/tools/nodejs/node_modules/.bin:$HOME/dotfiles/tools/ruby/bin:$PATH"
 export PYTHONSTARTUP="$HOME/.pythonstartup"
 # Node.js - disable update-notifier system-wide
 export NO_UPDATE_NOTIFIER=1
diff --git a/vimrc b/vimrc
index 6a6cd57..d0829ab 100644
--- a/vimrc
+++ b/vimrc
@@ -110,8 +110,10 @@ if v:progname ==? 'vim'
     \}
     let g:ale_fixers = {
     \   'javascript': ['eslint', 'prettier'],
-    \   'python': ['autopep8'],
+    \   'python': ['black'],
     \}
+    "let g:ale_python_auto_pipenv = 1
+
     " Consider these options
     " let g:ale_lint_on_insert_leave = 1
     "nmap <silent> <C-k> <Plug>(ale_previous_wrap)
@@ -349,9 +351,7 @@ Plug 'jamessan/vim-gnupg'
 "let g:GPGDebugLevel = 5
 let g:GPGPreferArmor = 1
 let g:GPGPreferSign = 1
-let g:GPGDefaultRecipients=[
- \"David Beitey (Work) <david" . nr2char(64) . "davidjb" . "." . "com>",
- \]
+let g:GPGDefaultRecipients=[]
 function! SetGPGOptions()
     setlocal foldlevel=1
     setlocal foldclose=all
@@ -359,6 +359,7 @@ function! SetGPGOptions()
 endfunction
 
 " Python editing superpowers
+Plug 'ambv/black'
 Plug 'python-mode/python-mode', { 'branch': 'develop', 'for': 'python' }
 let g:pymode_python = 'python3'
 let g:pymode_lint_on_write = 0