Merge woainvzu/Vifm_config_marslo to Marslo/VifmConfig