Improved testing
Merge pull request #2 from GrahamCampbell/travis

Improved testing