改名init前缀改成nae
改名init前缀改成nae
Merge branch 'master' of github.com:dongxiong/.emacs.d

Conflicts:
	config/nae-php.el
	init.el