Trying for Travis
Merge pull request #23 from johnb30/tests

Trying for Travis