Update vim config; reorganize sections