2.5-RC2 update and switch to more lift-data style tags.