Experimental changes
Travis tweaks
Travis fixes
Merge pull request #3 from GrahamCampbell/testing

Testing