document that Marc Weber stop contributing to this project, because UltiSnips does a better job now
Merge remote-tracking branch 'upstream/master'