including my own vim-snippets fork and some minor source refactoring