Update with some vim and lein updates