config.mk improvements

- change default to option 4 (Xft breaks some cyrillic stuff)
- remove unnecessary explicit include of /usr/include
- CFLAGS for all options are now additional instead of replace

Signed-off-by: Steven Honeyman <stevenhoneyman@users.noreply.github.com>