对配置项做了一些修改
Merge branch 'master' of github.com:banyudu/etc

Conflicts:
	.emacs