don't require shell-pop
add org-mode setup