add emacs.d (but some of the stuff is not used now...)
add ssh config file
Merge remote-tracking branch 'origin/master'