Tweaks to make .twig file highlighting work.  Perhaps caused by a new
version of vim?