Whoops
Merge branch 'master' into st3
Merge branch 'st3' of github.com:Floobits/sublime-text-2-plugin into st3