use 4 spaces for indentation
use centralized config.mk for Makefiles
Merge branch 'master' into testrssi