Updated Makefile and vimrc for portability.