Refactoring of get_data_files
Merge branch 'master' of https://github.com/jcarreira/firebox