These changes sort out the rake and bundler ordering issues.