Merge woainvzu/snipmate.vim to Marslo/snipmate.vim