Loosen dependencies on bundler and rake to allow upgrading.

@jrafanie Please review.