Fixing travis builds
another travis fix
another travis fix, part 2
another travis fix, part 3
another travis fix, part 4
another travis fix, part 5
Merge pull request #156 from jaytaph/travis

Travis