html indentation to 4
Merge branch 'master' of github.com:tsolar/emacs
web-mode to php mode for .php files