new php syntax doodads
add org-mode defaults; minor rearrangement of code blocks
Merge branch 'master' of github.com:gkallenberg/dotemacs into linux

Conflicts:
	emacs