prospective fix for Travis timeouts
another prospective fix for Travis timeouts
another prospective fix for Travis timeouts
another prospective fix for Travis failures

maybe it's not a timeout issue at all?
Merge remote-tracking branch 'origin/master' into sbt-0.13