OASIS part0

OASIS part1

merge

update OPAM

updates from jpd
OASIS: remove topkg