Upd Makefile

Fix small typo in intif.h, ifndef was being unused.
Upd Makefile to simplify libconfig inclusion
Merge branch 'rathena/master'
Follow up 8ed4e5e, and misc

Signed-off-by: Cydh Ramdh <house.bad@gmail.com>
Merge branch 'master'