Upgrade to rails 4.1.5 continued and fix specs