diff --git a/vimrc b/vimrc
index 7e14223..39124d1 100644
--- a/vimrc
+++ b/vimrc
@@ -26,6 +26,9 @@ map ,w :%s/  *$//<CR>
 
 let g:go_fmt_command = "goimports"
 let g:airline_powerline_fonts = 1
+let g:rustfmt_autosave = 1
+let g:terraform_align = 1
+let g:terraform_fmt_on_save = 1
 
 call pathogen#infect()
 
diff --git a/zshrc b/zshrc
index 6b8a05a..893b2b9 100644
--- a/zshrc
+++ b/zshrc
@@ -82,6 +82,7 @@ path=(
   $HOME/bin
   $HOME/go/bin
   $HOME/.local/bin
+  $HOME/.cargo/bin
   $HOME/.rbenv/bin
   $HOME/.rbenv/shims
   $HOME/.phpenv/bin
@@ -107,7 +108,11 @@ if which phpenv >/dev/null; then
   eval "$(phpenv init - 2>/dev/null)"
 fi
 
-eval "$(gimme 1.9.2)" 2>/dev/null
+if [[ -f ~/.cargo/env ]]; then
+  source ~/.cargo/env
+fi
+
+eval "$(gimme '1.9.3')" 2>/dev/null
 export GOPATH="$HOME/go"
 
 CDPATH="$HOME/code:$HOME/src:$HOME/Development/src:$HOME/repos"