not too sure what's going on here but i'm just gonna commit
Merge branch 'master' of github.com:unphased/sublime-text-3-user-package