Merge branch 'refs/heads/develop'
remove bitbucket api from master
switch branch back to master
Merge branch 'refs/heads/develop'

Conflicts:
	includes/class-bitbucket-api.php
Merge branch 'refs/heads/develop'

Conflicts:
	github-updater.php
Update CHANGES.md
Merge branch 'refs/heads/develop'
Merge branch 'master' of github.com:afragen/github-updater
Merge branch 'refs/heads/patch-1' into develop

Conflicts:
	github-updater.php
error checking for wp_remote_get to wp.org API