Some work on our Travis CI script.

Increased the number of jobs since the build now goes through with 4
parallel jobs. Also some minor cleaning up.