make purgatory work with STI records
Merge branch 'master' into sti
Small reformating
Version bump to 2.5.0