Clojure plugin will handle this
Merging in latest global changes from ctrlp branch
Just cleanup all around