Fix logic to search for data to allow packaging with conda.
Merge remote-tracking branch 'travis/master'