diff --git a/bashrc b/bashrc
index 635e134..11c95c7 100644
--- a/bashrc
+++ b/bashrc
@@ -27,3 +27,6 @@ alias pi='ssh pi -t ''tmux a -t home \|\| tmux new-session -s home'''
 alias server='ssh server -t ''tmux a -t home \|\| tmux new-session -s home'''
 alias ltc='getclip | luac -l -'
 stty -ixon
+
+# Enable Vi editing mode
+set -o vi
diff --git a/vimrc b/vimrc
index eb371cd..c84b5c6 100644
--- a/vimrc
+++ b/vimrc
@@ -478,7 +478,7 @@ function! s:init_lua_file()
 endfunction!
 
 " --- HTML Stuff ---
-au BufNewFile,BufRead *.html,*.htm :call <sid>init_html_file()
+au BufNewFile,BufRead *.html,*.htm,*.etlua,*.erb :call <sid>init_html_file()
 
 function! s:init_html_file()
 	command! -buffer -nargs=1 Tag normal