Mostly vim (code completion) and mutt improvements