diff --git a/vim/vim.symlink/functions.vim b/vim/vim.symlink/functions.vim
index c0ea29a..9d3e310 100644
--- a/vim/vim.symlink/functions.vim
+++ b/vim/vim.symlink/functions.vim
@@ -85,3 +85,6 @@ function! SetCustomCommand()
     let s:customcommand = input('Enter Custom Command$ ')
 endfunction
 
+function! TrimWhiteSpace()
+	%s/\s\+$//e
+endfunction
diff --git a/vim/vimrc.symlink b/vim/vimrc.symlink
index 6b0f2cf..9b53a59 100644
--- a/vim/vimrc.symlink
+++ b/vim/vimrc.symlink
@@ -63,7 +63,7 @@ if has("autocmd") && !exists("autocommands_loaded")
     autocmd FileType yaml setlocal ts=2 sts=2 sw=2 expandtab
     autocmd FileType make setlocal ts=8 sts=8 sw=8 noexpandtab
     autocmd FileType ruby setlocal ts=2 sts=2 sw=2 expandtab
-    autocmd FileType html setlocal ts=4 sts=4 sw=4 expandtab indentkeys-=*<return>
+    autocmd FileType html setlocal ts=4 sts=4 sw=4 noexpandtab indentkeys-=*<return>
     autocmd FileType jade setlocal ts=2 sts=2 sw=2 noexpandtab
     "autocmd WinEnter * setlocal cursorline
     "autocmd WinLeave * setlocal nocursorline