Merge pull request #5 from mikesaurio/master

update travis