updated rails 4 branch to 2.1.3 release for security

Just added in the changes needed for the security update to 2.1.3, all tests still passing.