Merge branch 'master' in

Conflicts:
octokit.coffee
octokit.js