Merge pull request #242 from tbrisker/dev

added stats to locality, fixing #212
Analytics now wants the code at the head...