Remove rename2 for now

Didn't work with pathogen.
Add vim-snippets
Merge branch 'master' into apricot