General changes to work with SublimeText 3 API