upgrade to rails 4, tweaks to allow for greater validity