Add icehousr and trunk local.conf