Remove sublime version abstraction
Merge branch 'master' into ST3