Fixes and additions

Various fixes to comply with vim-snippets conventions.
Addition of various new snippets.