merge hyphal.net and nickpatch.net