removed functions specific to the IBIS model; those are for a separate package
removed conflicting files before merge
merge