Get rid of settings_data.h includes in file_list.c/h
Merge branch 'master' of https://github.com/libretro/RetroArch into patch-1
Fix indent