added support for vimdiff
added termial key (calculator)