Trying to fix travis.
Merge pull request #69 from spartan-array/travis-ci

Mostly fix travis-ci build.