added shell-expand-line and edit-and-exectue-command shortcuts; fix for monokai vim theme