Merge pull request #18 from jlambert121/master

update travis config