Merge branch 'master' of github.com:rapala/.emacs.d
tramp