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

Improved Travis Testing