Merge branch 'master' of github.com:purplefish32/sublime-text-2-wordpress