Merged in old vim config, git config file.