diff --git a/.vim/ftplugin/javascript.vim b/.vim/ftplugin/javascript.vim
index 0c0c07f..b8df966 100644
--- a/.vim/ftplugin/javascript.vim
+++ b/.vim/ftplugin/javascript.vim
@@ -1,3 +1,3 @@
-set shiftwidth=2
-set tabstop=2
+set shiftwidth=4
+set tabstop=4
 set expandtab
diff --git a/.vimrc b/.vimrc
index 432ed36..6fe44b9 100644
--- a/.vimrc
+++ b/.vimrc
@@ -14,6 +14,7 @@ call vundle#begin()
     Plugin 'slim-template/vim-slim'
     Plugin 'kchmck/vim-coffee-script'
     Plugin 'fatih/vim-go'
+    Plugin 'fatih/vim-hclfmt'
     Plugin 'nanotech/jellybeans.vim'
     Plugin 'ervandew/supertab'
     Plugin 'scrooloose/nerdcommenter'
@@ -25,6 +26,7 @@ call vundle#begin()
     Plugin 'ctrlpvim/ctrlp.vim'
     Plugin 'itchyny/lightline.vim'
     Plugin 'heavenshell/vim-jsdoc'
+    Plugin 'hashivim/vim-terraform'
 
     " Past plugins
     "
@@ -162,6 +164,8 @@ if has("autocmd")
     " on some machines md files are thought to be modula2
     autocmd BufNewFile,BufRead *.md set filetype=markdown
 
+    autocmd BufNewFile,BufRead *.tf set filetype=terraform
+
     " add Coloring for ChucK source
     autocmd BufNewFile,BufRead *.ck set filetype=ck
 
@@ -328,6 +332,10 @@ endif
 let g:NERDTreeDirArrows = 1
 " ---------------------------------------------------------------------------}}}
 
+" terraform -----------------------------------------------------------------{{{
+let g:terraform_align=1
+" ---------------------------------------------------------------------------}}}
+
 " Commenting ----------------------------------------------------------------{{{
 " left-align comment markers by default
 let g:NERDDefaultAlign='left'