edited vimrc and Makefile