Fixing conflicts with github api gem
Fixing conflicts with github api gem

rashmirathi1729/bitbucket,cocktail-io/bitbucket,codeship/bitbucket,codeship/bitbucket,reenhanced/bitbucket,fairfaxmedia/bitbucket,vongrippen/bitbucket,marcinwyszynski/bitbucket,rashmirathi1729/bitbucket,vongrippen/bitbucket,bitbucket-rest-api/bitbucket,cocktail-io/bitbucket,marcinwyszynski/bitbucket,iconnor/bitbucket