Decrease test count
Merge pull request #1117 from twitter/decreaseTravisBuilds

Decrease test count
Merge branch 'develop' into ianoc/scalding_210

Conflicts:
	.travis.yml
Remove 2.11 repl build
Travis cleanup