Using melpa.org for packages.
Adding php-refactor-mode.
Fixing hook for smerge-mode.