Merge pull request #1 from keithj/devel

Synchronize with genotyping
Merge pull request #2 from keithj/devel

Added text data object reader
Merge pull request #3 from keithj/devel

Improved some brittle tests.
Merge pull request #4 from keithj/devel

Added Travis build