Submitted to Baylearn version.  Fixed merge conflits which were left in the last version.