use builtin bin_annot and annot tags

use ocamlbuild builtin bin_annot and annot tags instead of rolling our own.

also remove some trailing whitespace
add annot files to test expectations