Merge pull request #5 from mikesaurio/master

update travis
Merge pull request #42 from LabPLC/master

Merge pull request #5 from mikesaurio/master