upgrade sb2 packages
Merge remote branch 'origin/master'

Conflicts:
	sublime-text-2/Packages/User/Package Control.last-run