dependency fixes

rails 4.1.* support