Updated testing
Merge pull request #144 from GrahamCampbell/travis

Updated Testing