travis integration
Merge pull request #96 from puphpet/travis

Travis integration