Merge pull request #1273 from jeapostrophe/master

Fixing iOS menu problems and cleaning code
Build fix
Generalize variable names
Implement other driver options too
Implement joypad driver settings options too
Small change
playlist.c - add warnings
Add content history dir and change 'retroarch-history.txt' to 'retroarch-content-history.txt'
Add early return to RARCH_CMD_HISTORY_INIT
Move rarch_main_command(RARCH_HISTORY_INIT) outside of check
for history list enable
(XMB) Fix another display bug
Merge pull request #1274 from lakkatv/xmb

(XMB) Fix another display bug
(XMB) Move all file_list caching actions inside the xmb display driver
(XMB) Move all file_list caching variables to the xmb display driver
Merge pull request #1275 from lakkatv/xmb

(XMB) Move all caching stuff to the display driver
Add log to RARCH_CMD_HISTORY_INIT
Change how content_playlist_read_file works
Take out fclose on early return since it was only there for when
playlist is NULL
Show history list when g_settings.history_list_enable is true
Should fix history list not being saved when launching from CLI