Updated to Lift 2.5 final

In addition to some formatting of code