merged changes up to latest status of MainTrunk;
Basis still compiles (and is still incomplete in parts);
smlnj-lib does not compile because of changes to Basis signatures