diff --git a/.vim/after/ftplugin/eruby.vim b/.vim/after/ftplugin/eruby.vim
deleted file mode 120000
index 0c53264..0000000
--- a/.vim/after/ftplugin/eruby.vim
+++ /dev/null
@@ -1 +0,0 @@
-/home/hal/merb.vim/after/ftplugin/eruby.vim
\ No newline at end of file
diff --git a/.vim/after/ftplugin/eruby_surround.vim b/.vim/after/ftplugin/eruby_surround.vim
deleted file mode 120000
index fede5b0..0000000
--- a/.vim/after/ftplugin/eruby_surround.vim
+++ /dev/null
@@ -1 +0,0 @@
-/home/hal/merb.vim/after/ftplugin/eruby_surround.vim
\ No newline at end of file
diff --git a/.vim/after/ftplugin/make.vim b/.vim/after/ftplugin/make.vim
new file mode 100644
index 0000000..0147abe
--- /dev/null
+++ b/.vim/after/ftplugin/make.vim
@@ -0,0 +1 @@
+set noexpandtab
diff --git a/.vim/after/ftplugin/markdown.vim b/.vim/after/ftplugin/markdown.vim
new file mode 100644
index 0000000..8c81592
--- /dev/null
+++ b/.vim/after/ftplugin/markdown.vim
@@ -0,0 +1,2 @@
+set spell
+set textwidth=80
diff --git a/.vim/after/ftplugin/python.vim b/.vim/after/ftplugin/python.vim
new file mode 100644
index 0000000..0147abe
--- /dev/null
+++ b/.vim/after/ftplugin/python.vim
@@ -0,0 +1 @@
+set noexpandtab
diff --git a/.vim/after/ftplugin/sh.vim b/.vim/after/ftplugin/sh.vim
new file mode 100644
index 0000000..0147abe
--- /dev/null
+++ b/.vim/after/ftplugin/sh.vim
@@ -0,0 +1 @@
+set noexpandtab
diff --git a/.vim/after/ftplugin/txt.vim b/.vim/after/ftplugin/txt.vim
new file mode 100644
index 0000000..8c81592
--- /dev/null
+++ b/.vim/after/ftplugin/txt.vim
@@ -0,0 +1,2 @@
+set spell
+set textwidth=80
diff --git a/.vimrc b/.vimrc
index 97f9209..3690869 100644
--- a/.vimrc
+++ b/.vimrc
@@ -9,20 +9,9 @@ color ir_black
 syntax on
 filetype plugin indent on
 
-" make and python use real tabs
-autocmd FileType make set noexpandtab
-autocmd FileType python set noexpandtab
-
 " Thorfile, Rakefile and Gemfile are Ruby
 autocmd BufRead,BufNewFile {Gemfile,Rakefile,Thorfile,config.ru} set ft=ruby
-
-" Wrap text to 80 columns for *.md and *.txt files
-autocmd BufNewFile,BufRead *.txt set textwidth=80
-autocmd BufNewFile,BufRead *.md set textwidth=80
-
-" Enable spellchecking for *.md and *.txt files
-autocmd BufNewFile,BufRead *.txt set spell
-autocmd BufNewFile,BufRead *.md set spell
+autocmd BufRead,BufNewFile *.txt set ft=txt
 
 " md, markdown, and mk are markdown and define buffer-local preview
 " au BufRead,BufNewFile *.{md,markdown,mdown,mkd,mkdn} call s:setupMarkup()