diff --git a/vimrc b/vimrc
index 24ce476..89414f5 100644
--- a/vimrc
+++ b/vimrc
@@ -230,7 +230,8 @@ Plug 'rust-lang/rust.vim'               " Rust
 Plug 'jdonaldson/vaxe'                  " Haxe
 Plug 'pprovost/vim-ps1'                 " PowerShell
 Plug 'fedorenchik/fasm.vim'             " Flat Assembler
-Plug 'sir-pinecone/vim-elixir'          " Elixir
+Plug 'elixir-editors/vim-elixir'        " Elixir
+
 
 " Clojure -- Disabled since I'm not doing any Clojure work atm.
 "Plug 'tpope/vim-classpath' " For Java
@@ -522,6 +523,9 @@ augroup campoCmds
     " Properly indent schemes (scheme, racket, etc).
     autocmd BufRead,BufNewFile *.{lisp,scm,rkt} setlocal equalprg=scmindent.rkt
 
+    " Elixir indent
+    autocmd FileType elixir setlocal tabstop=2 | setlocal shiftwidth=2 | setlocal softtabstop=2
+
     " Fasm indent; uses the fedorenchik/fasm.vim plugin.
     autocmd BufReadPre *.asm let g:asmsyntax = "fasm"
 
@@ -907,11 +911,6 @@ let g:clojure_align_multiline_strings = 1
 let g:clojure_fuzzy_indent_patterns = ['^match', '^with', '^def', '^let']
 let g:clojure_fuzzy_indent_blacklist = ['-fn$', '\v^with-%(meta|out-str|loading-context)$']
 
-"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
-" VIM-ELIXIR
-"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
-"let g:vim_elixir_set_tabs = 1
-
 """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 " RUST.VIM
 """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""