画面関係の設定を移動
Merge branch 'master' of https://github.com/kskotetsu/dot.emacs

Conflicts:
	inits/00-global.el