code for MWLearn Assemblage
Merge remote-tracking branch 'origin/master' into 2014-09_bv-scratch
Corrected several bugs and warnings