Fix travis and cluster installs.
Merge pull request #1179 from brendandburns/fix

Fix travis and cluster installs.