clojure ns yasnippet.
Merge branch 'master' of github.com:pat-thomas/emacs

Conflicts:
	snippets/clojure-mode/ns