added vimshell, changed conque mapping...