Better chapter titles for php chapters
Rename php chapter about organization/refactoring
Merging 'master' into 'gh-pages'