Merge pull request #4 from keithj/master

Travis test configuration