stash
Do not use built-in make
Fix fnr for the new defaults
temp
Merge branch 'master' of github.com:Grimy/vimfiles

Conflicts:
	scripts/functions/c.fish
	scripts/ycm.py
vim as a mergetool