Rewrote the makefile.  Removed filetype specific lines from .vimrc