Sync with amix/vimrc