Fix controller test failures, cache bundler when running travis