updated vimrc and Makefile