Simplify travis command

Let's see if this makes the build go green.
Merge pull request #1142 from otoolep/update_travis

Simplify travis test command
Merge branch 'master' into update_contributing