Merged in local vim preferences