SublimePython settings
Merge remote-tracking branch 'origin/master'

Conflicts:
	Package Control.cache/ad7758d143e99a76034aad71ae2a1f3b
	Package Control.cache/ad7758d143e99a76034aad71ae2a1f3b.info
	Package Control.last-run
Revert "Merge remote-tracking branch 'origin/master'"

This reverts commit 694dc331eec2771559036143138f3749a9e837df.