Updates for Travis
Merge pull request #134 from shermdog/unit-tests

Updates for Travis