Makefile improvements, vim directives