Gem updates and prep for rails 4.0