Update travis testing
Merge pull request #698 from merk/new-testing

Update testing