Upgrade for lita 2.2+

This works with 2.x and 3.x