Add shell-dir to open shell emacs with a given directory
Merge branch 'master' into mein