Fixes to the Makefile
Fix line endings on vimrc (set ff=unix)