add .cljs extension to auto-mode-alist
Merge branch 'cljs-auto-mode-alist'

Conflicts:
	clojure-mode.el