Add clojure plugin
more changes that I've been too lazy to commit (this time from the linux box)
Merge remote-tracking branch 'origin'