Solve compatibility problem with Emacs < 23.2
Add PHPUnit snippets and org setup modifications