Fix Makefile
Simplify/fix config.mk
Remove qt removal from TODO