diff --git a/vimrc b/vimrc
index cb92e6b..9ae4154 100644
--- a/vimrc
+++ b/vimrc
@@ -87,9 +87,7 @@ let g:rustfmt_autosave = 1
 
 " vim-go configuration:
 let g:go_fmt_command = "goimports"
-
-" vim-terraform configuration:
-let g:terraform_fmt_on_save=1
+autocmd BufNewFile,BufRead *.gohtml set syntax=gohtmltmpl
 
 " vim-rails configuration:
 let g:rails_projections = {
diff --git a/zshrc b/zshrc
index 071ce11..24004c9 100644
--- a/zshrc
+++ b/zshrc
@@ -140,6 +140,5 @@ if [ $(tty) = "/dev/tty1" ]; then
   startx
 fi
 
-# Automatically added by terraform (vim bundle?):
-autoload -U +X bashcompinit && bashcompinit
-complete -o nospace -C /home/rob/bin/terraform terraform
+# For Ubuntu, disable Caps-Lock:
+setxkbmap -option caps:none