Updated version
Removing aggregation code - for 2.5.1
Escape non-variables in docs
Minor test clean ups
Updated upgrade docs
Updated changelog