awesomejapan: fix broken merge
ivar2: add util lib, and support reloading it