LOCAL_CONFIG and THIS_CONFIG switch in xkb makefile
ud layout renamed fr-colemak (fish config modified)
Merge branch 'master' of https://github.com/lepieru/myconfig

Conflicts:
	xkb/makefile
Vim config added