[xen] include edited Xen config
[merlin] depend on block devices too
[git] allow coffeescript output in tree
[make] env var is ADDR not IPADDR
[make] clean up xen and fat droppings better
[config] tweak config for xen build