Fix merge
Add syntastic

(cherry picked from commit 91a01733ccae138e26563c4aeac1b6c80adc1e24)
Add vim-signify
No more clojure in my life hopefully
Add vim-signify