Waste 2 hours getting UltiSnips working properly.
Add UltiSnips settings.
Correct filename for UltiSnips settings file.
Merge branch 'develop'