Merge master. Fix conflicts. This totally breaks st3 though
Merge branch 'st3' of github.com:Floobits/sublime-text-2-plugin into st3