Config in one

Move to consolidated heat.conf