consolidate, add site.vim