Fixed emacsd org-mode.
Added php extension.
Merge branch 'master' of github.com:watawu/config

Conflicts:
	.emacs.d/conf/50_org.el