git-init: .emacs and .emacs.d
Merge remote-tracking branch 'origin/master'