Testing improvements
Merge pull request #70 from GrahamCampbell/travis

Testing Improvements