Update the makefile to generate .annot and .bin-annot. Add them to .gitignore.
Use _loc in camlp4 quotations.
Add the opam package informations.

Also change the maintainer email.
Merge remote-tracking branch 'upstream/master'