Merge pull request #328 from bmyerz/master

document the other way to authenticate with github
Merge pull request #1 from ipython/master

Merge pull request #328 from bmyerz/master