snipmate-snippets replaced with vim-snippets; removed vim-conque
Merge branch 'master' of https://github.com/sukhorenko/vimfiles