Updated to work with Lift 2.5 and sbt 0.12