diff --git a/vimrc b/vimrc
index f29f767..545c110 100644
--- a/vimrc
+++ b/vimrc
@@ -22,6 +22,7 @@ set smartcase
 set tabstop=4
 set textwidth=67
 
+au BufRead,BufNewFile Pipfile setfiletype toml
 au BufRead,BufNewFile *.gcfg setfiletype gitconfig
 au QuickFixCmdPost *grep* cwindow
 
@@ -33,6 +34,8 @@ let g:airline_powerline_fonts = 1
 let g:go_fmt_command = "goimports"
 let g:python_highlight_all = 1
 let g:rustfmt_autosave = 1
+let g:shfmt_extra_args = '-i 2'
+let g:shfmt_fmt_on_save = 1
 let g:terraform_align = 1
 let g:terraform_fmt_on_save = 1
 let g:vim_markdown_folding_disabled = 1
diff --git a/zshrc b/zshrc
index 77935d8..f21c4ef 100644
--- a/zshrc
+++ b/zshrc
@@ -80,6 +80,7 @@ plugins=(
   ruby
   tmux
   vagrant
+  vault
   vi-mode
 )