added php-mode snippets and php modes to shibuya
Merge branch 'master' of github.com:DarrenN/prelude

* 'master' of github.com:DarrenN/prelude:
  autosave off
  removed ir-black
  [Fix #484] Set OS X specific latex settings conditionally
  web-mode is now compatible with minor modes