Merge pull request #1 from ipython/master

Merge pull request #328 from bmyerz/master
Fix the "docker run" command
Merge pull request #329 from bmyerz/master

README: fix docker run command line arguments