Merge and tidy up.
Merge with master.
Update Vim plugins for Clojure fun.