fix makefile and vimrc