Speeding up Travis by breaking up jobs
Merge pull request #2045 from daviddavis/temp_1366746709

Attempting to speed up Travis