Some changes to merging based on names being surrogates; Fixed bug in taxon page metrics
Cleaning up some unused code
Merge remote-tracking branch 'upstream3/master'