updates emacs.d
Merge branch 'master' of https://github.com/seikichi/dotfiles

Conflicts:
	.emacs.d/init.el
Merge branch 'master' of https://github.com/seikichi/dotfiles
Merge branch 'master' of https://github.com/seikichi/dotfiles
Merge branch 'master' of https://github.com/seikichi/dotfiles

Conflicts:
	.emacs.d/init.el