Refactor dir_list -> dir_merge_list

[FrostTusk]

Currently "dir_list" is used too much in the home assistant config, "dir_merge_list" is more clear. Renaming "malibu-point" to "includes" would also clear up the purpose of that directory.