Merge pull request #377 from rasendubi/master

Remove incompatibility issues with UltiSnips