Merged all the housekeeping we did in fix-abstraction into master.
Conflicts:
	.gitignore
	ocaml/grammar-noweb/Rules.mk
	ocaml/grammar-noweb/grammar_types.nw
	ocaml/thesis/Rules.mk
	ocaml/thesis/thesis.tex