Improved travis testing
Merge pull request #25 from GrahamCampbell/travis

Improved Travis Testing