re-rendered docs
use bottleneck for sorting, if available
Merge branch 'bottleneck' into develop