a lot of bundle updating for ruby 2.2 compat