Changes in the trouble branch
Mainline work
Completed merge of trouble, fixing conflicts along the way
merge from nanyu, fix conflict
merge from wenchang, fix conflicts in experiment.txt