备份配置
Merge branch 'master' of github.com:beixingqiao/emacs

Conflicts:
	.backups/!drive_d!emacs-24.3!.emacs.~15~
	.backups/!drive_d!emacs-24.3!.emacs.~21~
	.backups/!drive_d!emacs-24.3!.emacs.~22~
	.backups/!drive_d!emacs-24.3!.emacs.~23~
	.backups/!drive_d!emacs-24.3!.emacs.~24~
	backups/!drive_d!emacs-24.3!.emacs~
加入php-mode-improve 和 multi-web-mode
隐藏工具栏，菜单栏，滚动条