Synced up with pull requests from BitBucket
Merge branch 'master' of github.com:wbond/package_control_channel