Commented out 'vi' mode and settings