Makefile fix
Better configuration handling, fix logging in supervisor
Travis fixes