[bundle] Re-instate usage of bundle dir.
[travis] Don't install bundle groups we don't need for a test run.