Replace php+-mode with regular php-mode

It seems php+-mode has issues with latest trunk builds of Emacs 24.4.

mode-customizations.el

@@ -17,7 +17,7 @@
 (load-file (config-path "mode-customizations/lisp-mode.el"))
 (load-file (config-path "mode-customizations/makefile-mode.el"))
 (load-file (config-path "mode-customizations/markdown-mode.el"))
-(load-file (config-path "mode-customizations/php+-mode.el"))
+(load-file (config-path "mode-customizations/php-mode.el"))
 (load-file (config-path "mode-customizations/puppet-mode.el"))
 (load-file (config-path "mode-customizations/python-mode.el"))
 (load-file (config-path "mode-customizations/rhtml-mode.el"))

mode-customizations/php-mode.el

@@ -1,6 +1,6 @@
-(add-to-list 'auto-mode-alist '("\\.php\\'" . php+-mode))
+(add-to-list 'auto-mode-alist '("\\.php\\'" . php-mode))
 
-(defun customizations-for-php+-mode ()
+(defun customizations-for-php-mode ()
   (interactive)
   (setq whitespace-action (quote (auto-cleanup)))
   (flyspell-prog-mode)
@@ -14,4 +14,4 @@
   (highlight-indentation-mode)
   (highlight-indentation-current-column-mode))
 
-(add-hook 'php+-mode-hook 'customizations-for-php+-mode)
+(add-hook 'php-mode-hook 'customizations-for-php-mode)

packages.el

@@ -56,7 +56,7 @@
     magithub
     markdown-mode
     minimap
-    php+-mode
+    php-mode
     puppet-mode
     rainbow-mode
     restclient
@@ -144,9 +144,6 @@
   (when (require 'escreen nil 'noerror)
     (escreen-install))
 
-  ;; Load php+-mode
-  (require 'php+-mode)
-
   ;; Load ruby-electric (autoload fails)
   (require 'ruby-electric)