Merge pull request #17 from kjg/travis_updates

Test more combinations in travis