Updates for the 1.2.5 release

A few bug fixes, a few updates for the (disabled) new index, and a few updates to the template editor