Add headache configuration according the chosen licenses
Merge branch 'master' of github.com:ocaml/ocaml.org

Conflicts:
	Makefile