Merge "Allow Travis CI to run parallel tests"