added support for sublime-text 2 and 3, and some other tweaks