Added config.mk to gitignore and removed nojoinspaces from vimrc