Updated to rails 4.1.0.rc2, contour 2.5.0.beta1, and updated tests