Use php mode instead of clojure for nicer syntax highlighting
Merge branch 'master' into gh-pages