Be more generic in support for Sublime Text 2 and 3