Update Dependencies

@barnabyalter, this should be the final dependency update before going to Rails 4.