Snippets and a little vimrc clean up