Merge from ebi-cluster mainline
merge Rob Kooper's changes from ebi-cluster
Merge from Harvard: their r78
merge from harvard r79
merge
Harvard R81
move from bazaar to git